seq-cvs-commit Mailing List for ShowEQ Open Source Project (Page 38)

Brought to you by: cn187, dohpaz, fransick, ieatacid, and 2 others

seq-cvs-commit — syncmail generated CVS commit notifications

You can subscribe to this list here.

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (18)	Oct (11)	Nov (9)	Dec
2005	Jan	Feb (6)	Mar	Apr (10)	May (38)	Jun (15)	Jul (32)	Aug	Sep (17)	Oct (11)	Nov	Dec (14)
2006	Jan (2)	Feb (5)	Mar (3)	Apr (2)	May (3)	Jun (7)	Jul	Aug	Sep (3)	Oct (2)	Nov (6)	Dec (3)
2007	Jan	Feb (17)	Mar (5)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan (11)	Feb	Mar	Apr (4)	May	Jun (6)	Jul	Aug	Sep (6)	Oct (4)	Nov (1)	Dec
2009	Jan (3)	Feb (2)	Mar (4)	Apr	May (4)	Jun (3)	Jul	Aug (5)	Sep (3)	Oct (2)	Nov	Dec (6)
2010	Jan	Feb (6)	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec
2011	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar (1)	Apr	May	Jun	Jul (8)	Aug	Sep (2)	Oct (2)	Nov (4)	Dec (5)
2013	Jan (2)	Feb	Mar (2)	Apr (2)	May (1)	Jun (2)	Jul (2)	Aug (2)	Sep	Oct (2)	Nov (2)	Dec (2)
2014	Jan (3)	Feb (2)	Mar (3)	Apr (4)	May (4)	Jun (3)	Jul (4)	Aug (5)	Sep	Oct (2)	Nov (5)	Dec (2)
2015	Jan	Feb (2)	Mar	Apr	May (2)	Jun	Jul (2)	Aug	Sep	Oct	Nov (10)	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul (4)	Aug (2)	Sep (2)	Oct (3)	Nov (4)	Dec (2)
2017	Jan (2)	Feb	Mar (2)	Apr (4)	May (2)	Jun (2)	Jul (2)	Aug	Sep	Oct	Nov	Dec (2)
2018	Jan (4)	Feb (2)	Mar (2)	Apr (2)	May (2)	Jun (2)	Jul (8)	Aug (2)	Sep (2)	Oct (2)	Nov (4)	Dec (6)
2019	Jan (2)	Feb (2)	Mar (2)	Apr (4)	May (2)	Jun (3)	Jul (3)	Aug (2)	Sep (2)	Oct (13)	Nov (6)	Dec (4)
2020	Jan (7)	Feb (7)	Mar (7)	Apr (8)	May (5)	Jun (3)	Jul (10)	Aug (4)	Sep	Oct (37)	Nov (30)	Dec (8)
2021	Jan (14)	Feb (9)	Mar (7)	Apr (17)	May (3)	Jun (10)	Jul (7)	Aug (3)	Sep (3)	Oct (4)	Nov (15)	Dec (22)
2022	Jan (3)	Feb (3)	Mar (3)	Apr (3)	May (3)	Jun (3)	Jul (3)	Aug (5)	Sep (6)	Oct (4)	Nov (34)	Dec (17)
2023	Jan (3)	Feb (3)	Mar (29)	Apr (2)	May (18)	Jun (12)	Jul (12)	Aug (2)	Sep (7)	Oct (2)	Nov (2)	Dec (2)
2024	Jan (2)	Feb (10)	Mar (17)	Apr (6)	May (3)	Jun (9)	Jul (22)	Aug (48)	Sep (3)	Oct (2)	Nov (2)	Dec (8)
2025	Jan (3)	Feb (2)	Mar (9)	Apr (7)	May (3)	Jun (3)	Jul (2)	Aug (2)	Sep (11)	Oct (6)	Nov (9)	Dec (4)
2026	Jan (5)	Feb (6)	Mar (3)	Apr (7)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 36 37 38 39 40 .. 47 > >> (Page 38 of 47)

[Seq-cvs-commit] SF.net SVN: seq: [679] showeq/trunk/src

From: <cmm...@us...> - 2007-02-16 04:47:04

Revision: 679
          http://seq.svn.sourceforge.net/seq/?rev=679&view=rev
Author:   cmmalone
Date:     2007-02-15 20:47:02 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Hacked out itemdb. make distcheck was failing since it didn't put the
itemdb header out there but it was still being included.

Modified Paths:
--------------
    showeq/trunk/src/main.cpp
    showeq/trunk/src/spawnshell.cpp

Modified: showeq/trunk/src/main.cpp
===================================================================
--- showeq/trunk/src/main.cpp	2007-02-16 04:24:20 UTC (rev 678)
+++ showeq/trunk/src/main.cpp	2007-02-16 04:47:02 UTC (rev 679)
@@ -46,7 +46,9 @@
 #include "packetcommon.h"
 #include "xmlpreferences.h"      // prefrence file class
 #include "config.h"              // autoconf/configure definitions
+#ifdef ITEM_DB
 #include "itemdb.h"
+#endif
 #include "datalocationmgr.h"
 
 static const char *id="@(#) $Id$ $Name$";
@@ -144,11 +146,13 @@
   {"log-raw",                      no_argument,        NULL,  RAW_LOG_OPTION},
   {"systime-spawntime",            no_argument,        NULL,  SYSTIME_SPAWNTIME_OPTION},
   {"spawnlog-filename",            required_argument,  NULL,  SPAWNLOG_FILENAME_OPTION},
+#ifdef ITEM_DB
   {"itemdb-data-filename",         required_argument,  NULL, ITEMDB_DATA_FILENAME_OPTION},
   {"itemdb-raw-data-filename",     required_argument,  NULL, ITEMDB_RAW_FILENAME_OPTION},
   {"itemdb-databases-enabled",     required_argument,  NULL, ITEMDB_DATABASES_ENABLED},
   {"itemdb-disable",               no_argument,        NULL, ITEMDB_DISABLE},
   {"itemdb-enable",                no_argument,        NULL, ITEMDB_ENABLE},
+#endif
   {"restore-player-state",         no_argument,        NULL, RESTORE_PLAYER_STATE},
   {"restore-zone",                 no_argument,        NULL, RESTORE_ZONE_STATE},
   {"restore-spawns",               no_argument,        NULL, RESTORE_SPAWNS},
@@ -836,12 +840,14 @@
   printf ("      --unknown-zone-log-filename=FILE  Use FILE for above packet logging\n");
   printf ("      --log-raw                         Log some unprocessed raw data\n");
   printf ("      --spawnlog-filename=FILE          Use FILE instead of spawnlog.txt\n");
+#ifdef ITEM_DB
   printf ("      --itemdb-data-filename=FILE       Use FILE instead of itemdata\n");
   printf ("      --itemdb-raw-data-filename=FILE   Use FILE instead of itemrawdata\n");
   printf ("      --itemdb-databases-enabled=DBS    Use DBS to enable different item\n");
   printf ("                                        databases.\n");
   printf ("      --itemdb-disable                  Disable use of the item DB.\n");
   printf ("      --itemdb-enable                   Enable use of the item DB.\n");
+#endif
   printf ("  -W, --dont-autodetectcharsettings     Don't auto-detect your character's\n");
   printf ("                                        Level/Race/Class.\n");
   printf ("  -X, --default-level=##                Default player level. (1-70)\n");

Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp	2007-02-16 04:24:20 UTC (rev 678)
+++ showeq/trunk/src/spawnshell.cpp	2007-02-16 04:47:02 UTC (rev 679)
@@ -18,7 +18,6 @@
 #include "zonemgr.h"
 #include "player.h"
 #include "util.h"
-#include "itemdb.h"
 #include "guild.h"
 #include "packetcommon.h"
 #include "diagnosticmessages.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [678] showeq/trunk

From: <cmm...@us...> - 2007-02-16 04:24:22

Revision: 678
          http://seq.svn.sourceforge.net/seq/?rev=678&view=rev
Author:   cmmalone
Date:     2007-02-15 20:24:20 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Filled in some bodytypes from the exe, but these are just ones where
there exists items with bane data. So still some missing, most notably, 32.

Updated release and changelog.

Modified Paths:
--------------
    showeq/trunk/ChangeLog
    showeq/trunk/configure.in
    showeq/trunk/src/typenames.h

Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog	2007-02-16 03:04:57 UTC (rev 677)
+++ showeq/trunk/ChangeLog	2007-02-16 04:24:20 UTC (rev 678)
@@ -1,5 +1,12 @@
 Version: $Id$ $Name$
 
+purple (2/15/07)
++ Updated version to 5.8
++ Compatibility with TBS expansion
++ Opcodes updated (Zaphod, purple, ieatacid)
++ Structs updated (Zaphod, purple)
++ Regenerated zones, bodytypes, races, staticspells
+
 dohpaZ (2/2/07)
 ------------------------
 + Updated version to 5.7.0.1

Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in	2007-02-16 03:04:57 UTC (rev 677)
+++ showeq/trunk/configure.in	2007-02-16 04:24:20 UTC (rev 678)
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.7.0.1)
+AC_INIT(showeq, 5.8.0.0)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CANONICAL_SYSTEM
 

Modified: showeq/trunk/src/typenames.h
===================================================================
--- showeq/trunk/src/typenames.h	2007-02-16 03:04:57 UTC (rev 677)
+++ showeq/trunk/src/typenames.h	2007-02-16 04:24:20 UTC (rev 678)
@@ -8,20 +8,20 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     NULL,			// 0
     "Humanoid",			// 1
-    NULL,			// 2
+    "Lycanthrope",			// 2
     "Undead",			// 3
     "Giant",			// 4
-    "Golem",			// 5
-    NULL,			// 6
-    "Shissar",			// 7
+    "Construct",			// 5
+    "Extraplanar",			// 6
+    "Magical",			// 7
     "UndeadPet",		// 8
     "BaneGiant",		// 9
     NULL,			// 10
     "Untargetable",		// 11
     "Vampyre",			// 12
-    NULL,			// 13
+    "Atenha Ra",			// 13
     "Greater Akheva",		// 14
-    NULL,			// 15
+    "Khati Sha",			// 15
     "Seru",			// 16
     NULL,			// 17
     NULL,			// 18
@@ -29,10 +29,10 @@
     "Luggald",		// 20
     "Animal",			// 21
     "Insect",			// 22
-    "ExtraPlanar",		// 23
-    "Summoned",			// 24
+    "Monster",		// 23
+    "Elemental",			// 24
     "Plant",			// 25
-    "Dragonkin",		// 26
+    "Dragon",		// 26
     "Elemental",		// 27
     "Summoned Creature",		// 28
     "Dragon",			// 29


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [677] showeq/trunk/conf/zoneopcodes.xml

From: <cmm...@us...> - 2007-02-16 03:05:03

Revision: 677
          http://seq.svn.sourceforge.net/seq/?rev=677&view=rev
Author:   cmmalone
Date:     2007-02-15 19:04:57 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
OP_LevelUpdate from ieatacid

Modified Paths:
--------------
    showeq/trunk/conf/zoneopcodes.xml

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-16 02:48:52 UTC (rev 676)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-16 03:04:57 UTC (rev 677)
@@ -574,7 +574,7 @@
     <opcode id="4775" name="OP_TributeInfo" updated="02/13/07">
         <comment>Tribute information</comment>
     </opcode>
-    <opcode id="6a93" name="OP_SkillUpdate" updated="12/07/05">
+    <opcode id="03c0" name="OP_SkillUpdate" updated="02/13/07">
         <comment>old SkillIncCode</comment>
         <payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
     </opcode>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [676] showeq/trunk/conf/zoneopcodes.xml

From: <cmm...@us...> - 2007-02-16 02:49:04

Revision: 676
          http://seq.svn.sourceforge.net/seq/?rev=676&view=rev
Author:   cmmalone
Date:     2007-02-15 18:48:52 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
OP_LevelUpdate from ieatacid

Modified Paths:
--------------
    showeq/trunk/conf/zoneopcodes.xml

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-16 02:27:00 UTC (rev 675)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-16 02:48:52 UTC (rev 676)
@@ -578,7 +578,7 @@
         <comment>old SkillIncCode</comment>
         <payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="74d8" name="OP_LevelUpdate" updated="04/19/06">
+    <opcode id="1442" name="OP_LevelUpdate" updated="02/13/07">
         <comment>old LevelUpUpdateCode</comment>
         <payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
     </opcode>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [675] showeq/trunk

From: <cmm...@us...> - 2007-02-16 02:27:04

Revision: 675
          http://seq.svn.sourceforge.net/seq/?rev=675&view=rev
Author:   cmmalone
Date:     2007-02-15 18:27:00 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
More opcodes from TBS
doorStruct, manaDecrementStruct, newZoneStruct updated

Modified Paths:
--------------
    showeq/trunk/conf/worldopcodes.xml
    showeq/trunk/conf/zoneopcodes.xml
    showeq/trunk/src/everquest.h

Modified: showeq/trunk/conf/worldopcodes.xml
===================================================================
--- showeq/trunk/conf/worldopcodes.xml	2007-02-16 00:12:10 UTC (rev 674)
+++ showeq/trunk/conf/worldopcodes.xml	2007-02-16 02:27:00 UTC (rev 675)
@@ -34,13 +34,13 @@
     <opcode id="66bd" name="OP_SendCharInfo" updated="02/13/07">
         <comment>Send all chars visible @ char select</comment>
     </opcode>
-    <opcode id="3d4b" name="OP_World_Client_CRC1" updated="02/13/07">
+    <opcode id="3d4b" name="OP_SendSpellChecksum" updated="02/13/07">
         <comment>Contains a snippet of spell data</comment>
     </opcode>
-    <opcode id="398d" name="OP_World_Client_CRC2" updated="02/13/07">
+    <opcode id="398d" name="OP_SendExeChecksum" updated="02/13/07">
         <comment>Second client verification packet</comment>
     </opcode>
-    <opcode id="2024" name="OP_World_Client_CRC3" updated="02/13/07">
+    <opcode id="2024" name="OP_UnknownChecksum" updated="02/13/07">
         <comment>Third client verification packet</comment>
     </opcode>
     <opcode id="2398" name="OP_MOTD" updated="02/13/07">

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-16 00:12:10 UTC (rev 674)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-16 02:27:00 UTC (rev 675)
@@ -34,10 +34,10 @@
         <comment>Inventory/bank items coming over during zone</comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
-    <opcode id="4135" name="OP_TaskDescription" updated="06/13/06">
+    <opcode id="3f0b" name="OP_TaskDescription" updated="02/13/07">
         <comment>Task descriptions coming down for task window</comment>
     </opcode>
-    <opcode id="3f0b" name="OP_TaskActivity" updated="06/13/06">
+    <opcode id="0e8b" name="OP_TaskActivity" updated="02/13/07">
         <comment>Task activity descriptions coming down for task window</comment>
     </opcode>
     <opcode id="5226" name="OP_CompletedTasks" updated="02/13/07">
@@ -46,7 +46,7 @@
     <opcode id="09ea" name="OP_Weather" updated="02/13/07">
         <comment>old WeatherCode</comment>
     </opcode>
-    <opcode id="02f4" name="OP_ReqNewZone" updated="02/13/07">
+    <opcode id="30b7" name="OP_ReqNewZone" updated="02/13/07">
         <comment>Client requesting NewZone_Struct</comment>
     </opcode>
     <opcode id="5d3e" name="OP_NewZone" updated="02/13/07">
@@ -56,7 +56,7 @@
     <opcode id="3665" name="OP_CustomTitles" updated="02/13/07">
         <comment>List of available titles</comment>
     </opcode>
-    <opcode id="5037" name="OP_ReqClientSpawn" updated="02/13/07">
+    <opcode id="02f4" name="OP_ReqClientSpawn" updated="02/13/07">
         <comment>Client requesting spawn data</comment>
     </opcode>
     <opcode id="6f73" name="OP_SpawnDoor" updated="02/13/07">
@@ -92,7 +92,7 @@
     <opcode id="5e9c" name="OP_ClientReady" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="3afb" name="OP_TGB" updated="06/13/06">
+    <opcode id="78ed" name="OP_TGB" updated="02/13/07">
         <comment>Client telling server to set targetgroupbuff</comment>
     </opcode>
     <opcode id="2fd1" name="OP_RaidJoin" updated="02/13/07">
@@ -142,10 +142,10 @@
         <comment>old NewCorpseCode</comment>
         <payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="3c2a" name="OP_RespawnWindow" updated="10/22/06">
+    <opcode id="17ad" name="OP_RespawnWindow" updated="02/13/07">
       <comment>Server telling client enough to populate the respawn window when you die</comment>
     </opcode>
-    <opcode id="6dc2" name="OP_RespawnFromHover" updated="10/22/06">
+    <opcode id="3f8e" name="OP_RespawnFromHover" updated="02/13/07">
       <comment>Server telling client that it is coming back from hover death</comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
@@ -153,7 +153,7 @@
         <comment>old SpawnUpdateCode</comment>
         <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="4341" name="OP_Animation" updated="06/13/06">
+    <opcode id="5369" name="OP_Animation" updated="02/13/07">
         <comment></comment>
     </opcode>
     <opcode id="0973" name="OP_SpawnAppearance" updated="02/13/07">
@@ -168,13 +168,13 @@
         <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment>
         <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="2cdc" name="OP_InitialMobHealth" updated="06/13/06">
+    <opcode id="6263" name="OP_InitialMobHealth" updated="02/13/07">
         <comment>Initial health sent when a player clicks on the mob. Subsequent updated will be OP_MobHealth</comment>
     </opcode>
-    <opcode id="2ba5" name="OP_MobHealth" updated="06/13/06">
+    <opcode id="2cdc" name="OP_MobHealth" updated="02/13/07">
         <comment>health sent when a player clicks on the mob</comment>
     </opcode>
-    <opcode id="7b0f" name="OP_DeltaCheck" updated="06/13/06">
+    <opcode id="41a9" name="OP_DeltaCheck" updated="02/13/07">
         <comment>Client sending server delta information.</comment>
     </opcode>
     <opcode id="1f4b" name="OP_GuildMemberUpdate" updated="02/13/07">
@@ -202,7 +202,7 @@
         <comment>Targeting a person - old ClientTargetCode</comment>
         <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="553c" name="OP_SpawnRename" updated="06/13/06">
+    <opcode id="6226" name="OP_SpawnRename" updated="02/13/07">
         <comment>Spawns getting renamed after initial NewSpawn</comment>
         <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
     </opcode>
@@ -210,7 +210,7 @@
         <comment>Spawn being illusioned (changing forms)</comment>
         <payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="17ad" name="OP_Shroud" updated="06/13/06">
+    <opcode id="3494" name="OP_Shroud" updated="02/13/07">
         <comment>Server putting players into shroud form</comment>
         <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
     </opcode>
@@ -232,7 +232,7 @@
         <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/>
         <comment>Declining to join a group</comment>
     </opcode>
-    <opcode id="744e" name="OP_GroupFollow" updated="06/13/05">
+    <opcode id="6f21" name="OP_GroupFollow" updated="02/13/07">
         <payload dir="both" typename="groupFollowStruct" sizechecktype="match"/>
         <comment>Accepting to join a group</comment>
     </opcode>
@@ -269,7 +269,7 @@
         <comment>old StartCastCode</comment>
         <payload dir="both" typename="startCastStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="4fc7" name="OP_LoadSpellSet" updated="06/13/05">
+    <opcode id="61ac" name="OP_LoadSpellSet" updated="02/13/07">
         <comment>/mem spellsetname</comment>
     </opcode>
     <opcode id="518a" name="OP_SwapSpell" updated="02/13/07">
@@ -281,10 +281,10 @@
         <payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
     </opcode>
 
-    <opcode id="4654" name="OP_InspectRequest" updated="06/13/06">
+    <opcode id="0d0b" name="OP_InspectRequest" updated="02/13/07">
         <comment>old InspectRequestCode</comment>
     </opcode>
-    <opcode id="0d0b" name="OP_InspectAnswer" updated="06/13/06">
+    <opcode id="0ec7" name="OP_InspectAnswer" updated="02/13/07">
         <comment>old InspectDataCode</comment>
         <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
     </opcode>
@@ -293,7 +293,7 @@
         <comment>old EmoteTextCode</comment>
         <payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="3510" name="OP_SimpleMessage" updated="06/13/06">
+    <opcode id="771d" name="OP_SimpleMessage" updated="02/13/07">
         <comment>old SimpleMessageCode</comment>
         <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
     </opcode>
@@ -305,7 +305,7 @@
         <comment>old ChannelMessageCode</comment>
         <payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="471b" name="OP_SpecialMesg" updated="06/13/06">
+    <opcode id="4135" name="OP_SpecialMesg" updated="02/13/07">
         <comment>Communicate textual info to client</comment>
         <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
     </opcode>
@@ -317,7 +317,7 @@
         <comment>old RandomCode</comment>
         <payload dir="server" typename="randomStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="48cd" name="OP_GetGuildMOTD" updated="06/13/06">
+    <opcode id="6c71" name="OP_GetGuildMOTD" updated="02/13/07">
         <comment></comment>
     </opcode>
 
@@ -333,26 +333,26 @@
     <opcode id="443f" name="OP_FinishTrade" updated="02/13/07">
         <comment>Trade is over</comment>
     </opcode>
-    <opcode id="69a3" name="OP_TradeCoins" updated="06/13/05">
+    <opcode id="0000" name="OP_TradeCoins" updated="06/13/05">
         <comment>Coins put in trade window</comment>
     </opcode>
     <opcode id="2b8f" name="OP_TradeAcceptClick" updated="06/13/06">
         <comment>One side clicks Accept on the trade</comment>
     </opcode>
 
-    <opcode id="4f27" name="OP_Consent" updated="06/13/06">
+    <opcode id="4f27" name="OP_Consent" updated="02/13/07">
         <comment>/consent someone</comment>
         <payload dir="client" typename="consentRequestStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="6c6e" name="OP_ConsentResponse" updated="06/13/06">
+    <opcode id="7f1c" name="OP_ConsentResponse" updated="02/13/07">
         <comment>Server replying with consent information after /consent</comment>
         <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="6889" name="OP_ConsentDeny" updated="06/13/06">
+    <opcode id="0a6f" name="OP_ConsentDeny" updated="02/13/07">
         <comment>/deny someone</comment>
         <payload dir="client" typename="consentRequestStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="43bb" name="OP_DenyResponse" updated="06/13/06">
+    <opcode id="648d" name="OP_DenyResponse" updated="02/13/07">
         <comment>Server replying with deny information after /deny</comment>
         <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
     </opcode>
@@ -422,7 +422,7 @@
     <opcode id="4b88" name="OP_AutoAttack" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="7c2e" name="OP_AutoAttack2" updated="06/13/06">
+    <opcode id="3299" name="OP_AutoAttack2" updated="02/13/07">
         <comment></comment>
     </opcode>
     <opcode id="10a1" name="OP_PetCommands" updated="10/27/05">
@@ -431,7 +431,7 @@
     <opcode id="4ed9" name="OP_SetRunMode" updated="02/13/07">
         <comment>old cRunToggleCode</comment>
     </opcode>
-    <opcode id="273a" name="OP_SaveOnZoneReq" updated="02/13/07">
+    <opcode id="0c9d" name="OP_SaveOnZoneReq" updated="02/13/07">
         <comment></comment>
     </opcode>
     <opcode id="7e03" name="OP_ShopEnd" updated="10/27/05">
@@ -450,7 +450,7 @@
     <opcode id="26b3" name="OP_LootComplete" updated="12/07/05">
         <comment>old sDoneLootingCode</comment>
     </opcode>
-    <opcode id="31b3" name="OP_EnvDamage" updated="12/07/05">
+    <opcode id="3980" name="OP_EnvDamage" updated="02/13/07">
         <comment>Environmental Damage</comment>
         <payload dir="client" typename="environmentDamageStruct" sizechecktype="match"/>
     </opcode>
@@ -464,7 +464,7 @@
         <comment>old OpenVendorCode</comment>
         <payload dir="both" typename="unknown" sizechecktype="none"/>
     </opcode>
-    <opcode id="1b2e" name="OP_MoveItem" updated="04/19/06">
+    <opcode id="69a3" name="OP_MoveItem" updated="02/13/07">
         <comment>Client moving an item from one slot to another</comment>
     </opcode>
     <opcode id="0f8e" name="OP_FaceChange" updated="10/27/05">
@@ -510,7 +510,7 @@
         <comment>old MoneyOnCorpseCode</comment>
         <payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="10f6" name="OP_ClickDoor" updated="04/19/06">
+    <opcode id="36e2" name="OP_ClickDoor" updated="02/13/07">
         <comment>old DoorOpenCode</comment>
         <payload dir="both" typename="uint8_t" sizechecktype="none"/>
     </opcode>
@@ -571,7 +571,7 @@
     <opcode id="5306" name="OP_Feedback" updated="10/27/05">
         <comment>/feedback</comment>
     </opcode>
-    <opcode id="083c" name="OP_TributeInfo" updated="12/07/05">
+    <opcode id="4775" name="OP_TributeInfo" updated="02/13/07">
         <comment>Tribute information</comment>
     </opcode>
     <opcode id="6a93" name="OP_SkillUpdate" updated="12/07/05">
@@ -582,7 +582,7 @@
         <comment>old LevelUpUpdateCode</comment>
         <payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="4926" name="OP_Logout" updated="06/13/06">
+    <opcode id="0000" name="OP_Logout" updated="06/13/06">
         <comment></comment>
         <payload dir="server" typename="none" sizechecktype="match"/>
     </opcode>
@@ -590,7 +590,7 @@
         <comment>Leadership AA Exp Update</comment>
         <payload dir="server" typename="leadExpUpdateStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="1622" name="OP_Lockouts" updated="06/13/06">
+    <opcode id="062c" name="OP_Lockouts" updated="02/13/07">
         <comment>Server telling client lockouts</comment>
     </opcode>
 

Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h	2007-02-16 00:12:10 UTC (rev 674)
+++ showeq/trunk/src/everquest.h	2007-02-16 02:27:00 UTC (rev 675)
@@ -564,7 +564,7 @@
 
 /*
 ** New Zone Code
-** Length: 836 Octets
+** Length: 912 Octets
 ** OpCode: NewZoneCode
 */
 struct newZoneStruct
@@ -591,13 +591,15 @@
 /*0616*/ uint8_t unknown0616[84];          // *** Placeholder
 /*0700*/ char    zonefile[64];             // Zone file name?
 /*0764*/ uint8_t unknown0764[36];          // *** Placeholder (12/05/2006)
-/*0800*/ uint8_t unknown0800[12];          // *** Placeholder 
-/*0812*/ uint8_t unknown0812[4];           // *** Placeholder (06/29/2005)
-/*0816*/ uint8_t unknown0816[4];           // *** Placeholder (09/13/2005)
-/*0820*/ uint8_t unknown0620[4];           // *** Placeholder (02/21/2006)
-/*0824*/ uint8_t unknown0824[36];          // *** Placeholder (06/13/2006)
-/*0860*/ uint8_t unknown0860[12];          // *** Placeholder (12/05/2006)
-}; /*0872*/
+/*0800*/ uint8_t unknown0800[32];          // *** Placeholder (02/13/2007)
+/*0832*/ uint8_t unknown0832[12];          // *** Placeholder 
+/*0844*/ uint8_t unknown0844[4];           // *** Placeholder (06/29/2005)
+/*0848*/ uint8_t unknown0848[4];           // *** Placeholder (09/13/2005)
+/*0852*/ uint8_t unknown0852[4];           // *** Placeholder (02/21/2006)
+/*0856*/ uint8_t unknown0856[36];          // *** Placeholder (06/13/2006)
+/*0892*/ uint8_t unknown0892[12];          // *** Placeholder (12/05/2006)
+/*0904*/ uint8_t unknown0904[8];           // *** Placeholder (02/13/2007)
+}; /*0912*/
 
 
 /**
@@ -1077,7 +1079,7 @@
 
 /*
 ** Generic Door Struct
-** Length: 88 Octets
+** Length: 92 Octets
 ** Used in: 
 **    OP_SpawnDoor
 **
@@ -1085,24 +1087,25 @@
 
 struct doorStruct
 {
-/*0000*/ char     name[16];        // Filename of Door?
-/*0016*/ uint8_t  unknown016[16]; // ***Placeholder
-/*0032*/ float    y;               // y loc
-/*0036*/ float    x;               // x loc
-/*0040*/ float    z;               // z loc
-/*0044*/ float    heading;         // heading
-/*0048*/ uint8_t  unknown0028[7]; // ***Placeholder
-/*0055*/ int8_t   auto_return;
-/*0056*/ uint8_t  initialState;
-/*0057*/ uint8_t  unknown041[3];
-/*0060*/ uint8_t  doorId;          // door's id #
-/*0061*/ uint8_t  opentype;       
-/*0062*/ uint8_t  size;           // size of door
+/*0000*/ char    name[16];        // Filename of Door?
+/*0016*/ uint8_t unknown016[16];  // ***Placeholder
+/*0032*/ float   y;               // y loc
+/*0036*/ float   x;               // x loc
+/*0040*/ float   z;               // z loc
+/*0044*/ float   heading;         // heading
+/*0048*/ uint8_t unknown0028[7];  // ***Placeholder
+/*0055*/ int8_t  auto_return;
+/*0056*/ uint8_t initialState;
+/*0057*/ uint8_t unknown041[3];
+/*0060*/ uint8_t doorId;          // door's id #
+/*0061*/ uint8_t opentype;       
+/*0062*/ uint8_t size;            // size of door
 /*0063*/ uint8_t holdstateforever;
 /*0064*/ uint32_t zonePoint;
-/*0068*/ uint8_t  unknown068[12]; // ***Placeholder
+/*0068*/ uint8_t unknown068[12]; // ***Placeholder
 /*0080*/ uint8_t unknown0080[8]; // ***Placeholder (12/07/2005)
-/*0088*/
+/*0088*/ uint8_t unknown0088[4]; // ***Placeholder (2/13/2007)
+/*0092*/
 }; 
 
 /*
@@ -1747,7 +1750,7 @@
 
 /*
 ** New Mana Amount
-** Length: 16 Octets
+** Length: 20 Octets
 ** OpCode: manaDecrementCode
 */
 
@@ -1757,7 +1760,8 @@
 /*0004*/ int32_t unknown;
 /*0008*/ int32_t spellId;                  // Last Spell Cast
 /*0012*/ uint8_t unknown0012[4];
-/*0016*/
+/*0016*/ uint8_t unknown0016[4];           //*** Placeholder (02/13/07)
+/*0020*/
 };
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [674] showeq/trunk/conf/worldopcodes.xml

From: <cmm...@us...> - 2007-02-16 00:12:11

Revision: 674
          http://seq.svn.sourceforge.net/seq/?rev=674&view=rev
Author:   cmmalone
Date:     2007-02-15 16:12:10 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
World opcodes updated for TBS

Modified Paths:
--------------
    showeq/trunk/conf/worldopcodes.xml

Modified: showeq/trunk/conf/worldopcodes.xml
===================================================================
--- showeq/trunk/conf/worldopcodes.xml	2007-02-15 05:25:27 UTC (rev 673)
+++ showeq/trunk/conf/worldopcodes.xml	2007-02-16 00:12:10 UTC (rev 674)
@@ -12,48 +12,51 @@
 -->
 
 
-    <opcode id="2154" name="OP_SendLoginInfo" updated="06/13/06">
+    <opcode id="61c9" name="OP_SendLoginInfo" updated="02/13/07">
         <comment>Client starting world session by asking for login information</comment>
     </opcode>
-    <opcode id="4465" name="OP_GuildList" updated="06/13/06">
+    <opcode id="4465" name="OP_GuildList" updated="02/13/07">
         <comment>old GuildListCode</comment>
         <payload dir="server" typename="worldGuildListStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="4b88" name="OP_LogServer" updated="06/13/06">
+    <opcode id="050d" name="OP_LogServer" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="669b" name="OP_ApproveWorld" updated="06/13/06">
+    <opcode id="3e54" name="OP_ApproveWorld" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="5250" name="OP_EnterWorld" updated="06/13/06">
+    <opcode id="431e" name="OP_EnterWorld" updated="02/13/07">
         <comment>Server approval for client to enter world</comment>
     </opcode>
-    <opcode id="508a" name="OP_ExpansionInfo" updated="06/13/06">
+    <opcode id="4ed2" name="OP_ExpansionInfo" updated="02/13/07">
         <comment>Which expansions user has</comment>
     </opcode>
-    <opcode id="72d2" name="OP_SendCharInfo" updated="06/13/06">
+    <opcode id="66bd" name="OP_SendCharInfo" updated="02/13/07">
         <comment>Send all chars visible @ char select</comment>
     </opcode>
-    <opcode id="0a31" name="OP_World_Client_CRC1" updated="06/13/06">
+    <opcode id="3d4b" name="OP_World_Client_CRC1" updated="02/13/07">
         <comment>Contains a snippet of spell data</comment>
     </opcode>
-    <opcode id="08fe" name="OP_World_Client_CRC2" updated="06/13/06">
+    <opcode id="398d" name="OP_World_Client_CRC2" updated="02/13/07">
         <comment>Second client verification packet</comment>
     </opcode>
-    <opcode id="319d" name="OP_MOTD" updated="06/13/06">
+    <opcode id="2024" name="OP_World_Client_CRC3" updated="02/13/07">
+        <comment>Third client verification packet</comment>
+    </opcode>
+    <opcode id="2398" name="OP_MOTD" updated="02/13/07">
         <comment>old MOTDCode Server message of the day</comment>
         <payload dir="server" typename="worldMOTDStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="01db" name="OP_SetChatServer" updated="06/13/06">
+    <opcode id="1007" name="OP_SetChatServer" updated="02/13/07">
         <comment>Chatserver? IP,Port,servername.Charname,password(?)</comment>
     </opcode>
-    <opcode id="15fa" name="OP_SetChatServer2" updated="06/13/06">
+    <opcode id="07e5" name="OP_SetChatServer2" updated="02/13/07">
         <comment>Chatserver? IP,Port,servername.Charname,password(?)</comment>
     </opcode>
-    <opcode id="1e1d" name="OP_ZoneServerInfo" updated="06/13/06">
+    <opcode id="7250" name="OP_ZoneServerInfo" updated="02/13/07">
         <comment>old ZoneServerInfo</comment>
     </opcode>
-    <opcode id="074f" name="OP_WorldComplete" updated="06/13/06">
+    <opcode id="69ef" name="OP_WorldComplete" updated="02/13/07">
         <comment>Client telling world server it is done. World replies by disconnecting.</comment>
     </opcode>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [673] showeq/trunk

From: <do...@us...> - 2007-02-15 05:25:28

Revision: 673
          http://seq.svn.sourceforge.net/seq/?rev=673&view=rev
Author:   dohpaz
Date:     2007-02-14 21:25:27 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Update buffStruct.  Update a bunch of opcodes to work with 2/13/07.

Modified Paths:
--------------
    showeq/trunk/conf/zoneopcodes.xml
    showeq/trunk/src/everquest.h

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-15 02:13:39 UTC (rev 672)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-15 05:25:27 UTC (rev 673)
@@ -56,7 +56,7 @@
     <opcode id="3665" name="OP_CustomTitles" updated="02/13/07">
         <comment>List of available titles</comment>
     </opcode>
-    <opcode id="7528" name="OP_ReqClientSpawn" updated="06/13/06">
+    <opcode id="5037" name="OP_ReqClientSpawn" updated="02/13/07">
         <comment>Client requesting spawn data</comment>
     </opcode>
     <opcode id="6f73" name="OP_SpawnDoor" updated="02/13/07">
@@ -72,7 +72,7 @@
         <comment>Coords in a zone that will port you to another zone</comment>
         <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="5051" name="OP_SendExpZonein" updated="06/13/06">
+    <opcode id="5051" name="OP_SendExpZonein" updated="02/13/07">
         <comment>Both directions. Negotiating sending of exp info.</comment>
     </opcode>
     <opcode id="499e" name="OP_AAExpUpdate" updated="02/13/07">
@@ -138,7 +138,7 @@
         <comment>old DeleteSpawnCode</comment>
         <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="1399" name="OP_Death" updated="02/13/07">
+    <opcode id="1c0c" name="OP_Death" updated="02/13/07">
         <comment>old NewCorpseCode</comment>
         <payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
     </opcode>
@@ -181,7 +181,7 @@
         <comment></comment>
         <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
     </opcode>
-    <opcode id="1418" name="OP_ClickObject" updated="06/13/06">
+    <opcode id="76f0" name="OP_ClickObject" updated="02/13/07">
         <comment>old RemDropCode</comment>
         <payload dir="both" typename="remDropStruct" sizechecktype="match"/>
     </opcode>
@@ -198,7 +198,7 @@
         <comment>old ConsiderCode</comment>
         <payload dir="both" typename="considerStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="3299" name="OP_TargetMouse" updated="06/13/06">
+    <opcode id="3d8e" name="OP_TargetMouse" updated="02/13/07">
         <comment>Targeting a person - old ClientTargetCode</comment>
         <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
     </opcode>
@@ -206,7 +206,7 @@
         <comment>Spawns getting renamed after initial NewSpawn</comment>
         <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="1657" name="OP_Illusion" updated="06/13/06">
+    <opcode id="4195" name="OP_Illusion" updated="02/13/07">
         <comment>Spawn being illusioned (changing forms)</comment>
         <payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
     </opcode>
@@ -224,11 +224,11 @@
         <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
     </opcode>
 
-    <opcode id="6f21" name="OP_GroupInvite" updated="06/13/06">
+    <opcode id="6625" name="OP_GroupInvite" updated="02/13/07">
         <payload dir="both" typename="groupInviteStruct" sizechecktype="match"/>
         <comment></comment>
     </opcode>
-    <opcode id="69c8" name="OP_GroupCancelInvite" updated="06/13/06">
+    <opcode id="24aa" name="OP_GroupCancelInvite" updated="02/13/07">
         <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/>
         <comment>Declining to join a group</comment>
     </opcode>
@@ -236,36 +236,36 @@
         <payload dir="both" typename="groupFollowStruct" sizechecktype="match"/>
         <comment>Accepting to join a group</comment>
     </opcode>
-    <opcode id="0ec7" name="OP_GroupUpdate" updated="06/13/06">
+    <opcode id="5660" name="OP_GroupUpdate" updated="02/13/07">
         <payload dir="server" typename="groupFullUpdateStruct" sizechecktype="match"/>
         <payload dir="server" typename="groupUpdateStruct" sizechecktype="match"/>
         <comment></comment>
     </opcode>
-    <opcode id="7e51" name="OP_GroupDisband" updated="06/13/06">
+    <opcode id="2462" name="OP_GroupDisband" updated="02/13/07">
         <comment>Disband from group</comment>
         <payload dir="both" typename="groupDisbandStruct" sizechecktype="match"/>
     </opcode>
 
-    <opcode id="55e8" name="OP_WhoAllRequest" updated="06/13/06">
+    <opcode id="55e8" name="OP_WhoAllRequest" updated="02/13/07">
         <comment>old WhoAllReqCode</comment>
     </opcode>
-    <opcode id="28ca" name="OP_WhoAllResponse" updated="06/13/06">
+    <opcode id="4581" name="OP_WhoAllResponse" updated="02/13/07">
         <comment>old sWhoAllOutputCode</comment>
     </opcode>
 
-    <opcode id="21c6" name="OP_Buff" updated="06/13/06">
+    <opcode id="6c49" name="OP_Buff" updated="02/13/07">
         <comment>old BuffDropCode</comment>
         <payload dir="both" typename="buffStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="129c" name="OP_BuffFadeMsg" updated="06/13/06">
+    <opcode id="2618" name="OP_BuffFadeMsg" updated="02/13/07">
         <comment>old SpellFadeCode</comment>
         <payload dir="both" typename="spellFadedStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="6a86" name="OP_BeginCast" updated="06/13/06">
+    <opcode id="6a86" name="OP_BeginCast" updated="02/13/07">
         <comment>old BeginCastCode</comment>
         <payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="141e" name="OP_CastSpell" updated="06/13/06">
+    <opcode id="60f2" name="OP_CastSpell" updated="02/13/07">
         <comment>old StartCastCode</comment>
         <payload dir="both" typename="startCastStruct" sizechecktype="match"/>
     </opcode>
@@ -327,10 +327,10 @@
     <opcode id="06fb" name="OP_TradeRequestAck" updated="06/13/06">
         <comment>Trade request recipient is acknowledging they are able to trade</comment>
     </opcode>
-    <opcode id="12a4" name="OP_CancelTrade" updated="06/13/06">
+    <opcode id="12a4" name="OP_CancelTrade" updated="02/13/07">
         <comment>Cancel a trade window</comment>
     </opcode>
-    <opcode id="70bd" name="OP_FinishTrade" updated="06/13/06">
+    <opcode id="443f" name="OP_FinishTrade" updated="02/13/07">
         <comment>Trade is over</comment>
     </opcode>
     <opcode id="69a3" name="OP_TradeCoins" updated="06/13/05">
@@ -369,7 +369,7 @@
         <payload dir="server" typename="itemInfoStruct" sizechecktype="none"/>
         <payload dir="client" typename="itemInfoReqStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="60f2" name="OP_ManaChange" updated="02/13/07">
+    <opcode id="129c" name="OP_ManaChange" updated="02/13/07">
         <comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
         <payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
         <payload dir="client" typename="uint8_t" sizechecktype="none"/>
@@ -419,7 +419,7 @@
     <opcode id="fe13" name="OP_ShopPlayerSell" updated="10/27/05">
         <comment>old SellItemCode</comment>
     </opcode>
-    <opcode id="7a46" name="OP_AutoAttack" updated="06/13/06">
+    <opcode id="4b88" name="OP_AutoAttack" updated="02/13/07">
         <comment></comment>
     </opcode>
     <opcode id="7c2e" name="OP_AutoAttack2" updated="06/13/06">
@@ -428,10 +428,10 @@
     <opcode id="10a1" name="OP_PetCommands" updated="10/27/05">
         <comment></comment>
     </opcode>
-    <opcode id="4aba" name="OP_SetRunMode" updated="10/27/05">
+    <opcode id="4ed9" name="OP_SetRunMode" updated="02/13/07">
         <comment>old cRunToggleCode</comment>
     </opcode>
-    <opcode id="6f49" name="OP_SaveOnZoneReq" updated="06/13/06">
+    <opcode id="273a" name="OP_SaveOnZoneReq" updated="02/13/07">
         <comment></comment>
     </opcode>
     <opcode id="7e03" name="OP_ShopEnd" updated="10/27/05">
@@ -538,19 +538,19 @@
     <opcode id="0375" name="OP_Report" updated="06/29/05">
         <comment></comment>
     </opcode>
-    <opcode id="3d8e" name="OP_TargetCommand" updated="02/13/07">
+    <opcode id="40b6" name="OP_TargetCommand" updated="02/13/07">
         <comment>Target user</comment>
     </opcode>
-    <opcode id="212d" name="OP_LFPGetMatchesResponse" updated="06/13/06">
+    <opcode id="212d" name="OP_LFPGetMatchesResponse" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="7b23" name="OP_Jump" updated="06/13/06">
+    <opcode id="0c0d" name="OP_Jump" updated="02/13/07">
         <comment>old cJumpCode?</comment>
     </opcode>
-    <opcode id="1133" name="OP_FindPersonRequest" updated="06/13/06">
+    <opcode id="1089" name="OP_FindPersonRequest" updated="02/13/07">
         <comment>Control-F Find</comment>
     </opcode>
-    <opcode id="0431" name="OP_FindResponse" updated="06/13/06">
+    <opcode id="71b1" name="OP_FindResponse" updated="02/13/07">
         <comment>Response to control-F</comment>
     </opcode>
     <opcode id="23a1" name="OP_GMLastName" updated="10/27/05">

Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h	2007-02-15 02:13:39 UTC (rev 672)
+++ showeq/trunk/src/everquest.h	2007-02-15 05:25:27 UTC (rev 673)
@@ -2239,8 +2239,7 @@
 /*0020*/ uint32_t playerId;       // Player id who cast the buff
 /*0024*/ uint32_t spellslot;      // spellslot
 /*0028*/ uint32_t changetype;     // 1=buff fading,2=buff duration
-/*0032*/ uint8_t  unknown0032[12];
-/*0044*/
+/*0032*/ 
 };
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [672] showeq/trunk/src/races.h

From: <cmm...@us...> - 2007-02-15 02:13:42

Revision: 672
          http://seq.svn.sourceforge.net/seq/?rev=672&view=rev
Author:   cmmalone
Date:     2007-02-14 18:13:39 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
New races for TBS.

Modified Paths:
--------------
    showeq/trunk/src/races.h

Modified: showeq/trunk/src/races.h
===================================================================
--- showeq/trunk/src/races.h	2007-02-15 01:59:05 UTC (rev 671)
+++ showeq/trunk/src/races.h	2007-02-15 02:13:39 UTC (rev 672)
@@ -556,4 +556,22 @@
     "Goo",                        // 547
     "Goo",                        // 548
     "Goo",                        // 549
+    "Merchant Ship",              // 550
+    "Pirate Ship",                // 551
+    "Ghost Ship",                 // 552
+    "Banner",                     // 553
+    "Banner",                     // 554
+    "Banner",                     // 555
+    "Banner",                     // 556
+    "Banner",                     // 557
+    "Aviak",                      // 558
+    "Beetle",                     // 559
+    "Gorilla",                    // 560
+    "Kedge",                      // 561
+    "Kerran",                     // 562
+    "Shissar",                    // 563
+    "Siren",                      // 564
+    "Sphinx",                     // 565
+    "Human",                      // 566
+    "Campfire",                   // 567
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [671] showeq/trunk/src

From: <cmm...@us...> - 2007-02-15 01:59:25

Revision: 671
          http://seq.svn.sourceforge.net/seq/?rev=671&view=rev
Author:   cmmalone
Date:     2007-02-14 17:59:05 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
New zones for TBS.
Regenerated staticspells.h from spells_us.txt from TBS.

Modified Paths:
--------------
    showeq/trunk/src/staticspells.h
    showeq/trunk/src/zones.h

Modified: showeq/trunk/src/staticspells.h
===================================================================
--- showeq/trunk/src/staticspells.h	2007-02-14 13:34:13 UTC (rev 670)
+++ showeq/trunk/src/staticspells.h	2007-02-15 01:59:05 UTC (rev 671)
@@ -387,7 +387,7 @@
 /* 0x0177 -   375 */ { "Fade" }, 
 /* 0x0178 -   376 */ { "Shock of Fire" }, 
 /* 0x0179 -   377 */ { "Icestrike" }, 
-/* 0x017a -   378 */ { "O'Keils Radiation" }, 
+/* 0x017a -   378 */ { "O`Keil's Radiation" }, 
 /* 0x017b -   379 */ { "Fingers of Fire" }, 
 /* 0x017c -   380 */ { "Column of Frost" }, 
 /* 0x017d -   381 */ { "Resistant Skin" }, 
@@ -481,10 +481,10 @@
 /* 0x01d5 -   469 */ { "Lava Storm" }, 
 /* 0x01d6 -   470 */ { "Thunder Strike" }, 
 /* 0x01d7 -   471 */ { "Thunderclap" }, 
-/* 0x01d8 -   472 */ { "Inspire Fear2" }, 
+/* 0x01d8 -   472 */ { "Inspire Fear II" }, 
 /* 0x01d9 -   473 */ { "Invoke Fear II" }, 
-/* 0x01da -   474 */ { "Radius of Fear2" }, 
-/* 0x01db -   475 */ { "Fear2" }, 
+/* 0x01da -   474 */ { "Radius of Fear II" }, 
+/* 0x01db -   475 */ { "Fear II" }, 
 /* 0x01dc -   476 */ { "Vampiric Embrace Strike" }, 
 /* 0x01dd -   477 */ { "Fire Bolt" }, 
 /* 0x01de -   478 */ { "Breath of the Dead" }, 
@@ -628,7 +628,7 @@
 /* 0x0268 -   616 */ { "Staff of Symbols" }, 
 /* 0x0269 -   617 */ { "Sword of Runes" }, 
 /* 0x026a -   618 */ { "Dimensional Hole" }, 
-/* 0x026b -   619 */ { "Dyn`s Dizzying Draught" }, 
+/* 0x026b -   619 */ { "Dyn's Dizzying Draught" }, 
 /* 0x026c -   620 */ { "Minor Conjuration: Earth" }, 
 /* 0x026d -   621 */ { "Minor Conjuration: Water" }, 
 /* 0x026e -   622 */ { "Minor Conjuration: Fire" }, 
@@ -690,16 +690,16 @@
 /* 0x02a6 -   678 */ { "Tashania" }, 
 /* 0x02a7 -   679 */ { "Heat Sight" }, 
 /* 0x02a8 -   680 */ { "Barrier of Combustion" }, 
-/* 0x02a9 -   681 */ { "Juli`s Animation" }, 
-/* 0x02aa -   682 */ { "Kilan`s Animation" }, 
-/* 0x02ab -   683 */ { "Shalee`s Animation" }, 
-/* 0x02ac -   684 */ { "Sisna`s Animation" }, 
-/* 0x02ad -   685 */ { "Sagar`s Animation" }, 
-/* 0x02ae -   686 */ { "Uleen`s Animation" }, 
-/* 0x02af -   687 */ { "Boltran`s Animation" }, 
+/* 0x02a9 -   681 */ { "Juli's Animation" }, 
+/* 0x02aa -   682 */ { "Kilan's Animation" }, 
+/* 0x02ab -   683 */ { "Shalee's Animation" }, 
+/* 0x02ac -   684 */ { "Sisna's Animation" }, 
+/* 0x02ad -   685 */ { "Sagar's Animation" }, 
+/* 0x02ae -   686 */ { "Uleen's Animation" }, 
+/* 0x02af -   687 */ { "Boltran's Animation" }, 
 /* 0x02b0 -   688 */ { "Aanya's Animation" }, 
-/* 0x02b1 -   689 */ { "Yegoreff`s Animation" }, 
-/* 0x02b2 -   690 */ { "Kintaz`s Animation" }, 
+/* 0x02b1 -   689 */ { "Yegoreff's Animation" }, 
+/* 0x02b2 -   690 */ { "Kintaz's Animation" }, 
 /* 0x02b3 -   691 */ { "Call of Flame" }, 
 /* 0x02b4 -   692 */ { "Life Leech" }, 
 /* 0x02b5 -   693 */ { "Divine Might" }, 
@@ -711,13 +711,13 @@
 /* 0x02bb -   699 */ { "Defoliate" }, 
 /* 0x02bc -   700 */ { "Chant of Battle" }, 
 /* 0x02bd -   701 */ { "Anthem de Arms" }, 
-/* 0x02be -   702 */ { "McVaxius` Berserker Crescendo" }, 
+/* 0x02be -   702 */ { "McVaxius' Berserker Crescendo" }, 
 /* 0x02bf -   703 */ { "Chords of Dissonance" }, 
-/* 0x02c0 -   704 */ { "Brusco`s Boastful Bellow" }, 
+/* 0x02c0 -   704 */ { "Brusco's Boastful Bellow" }, 
 /* 0x02c1 -   705 */ { "Largo's Melodic Binding" }, 
-/* 0x02c2 -   706 */ { "Angstlich`s Appalling Screech" }, 
-/* 0x02c3 -   707 */ { "Fufil`s Curtailing Chant" }, 
-/* 0x02c4 -   708 */ { "Cinda`s Charismatic Carillon" }, 
+/* 0x02c2 -   706 */ { "Angstlich's Appalling Screech" }, 
+/* 0x02c3 -   707 */ { "Fufil's Curtailing Chant" }, 
+/* 0x02c4 -   708 */ { "Cinda's Charismatic Carillon" }, 
 /* 0x02c5 -   709 */ { "Guardian Rhythms" }, 
 /* 0x02c6 -   710 */ { "Elemental Rhythms" }, 
 /* 0x02c7 -   711 */ { "Purifying Rhythms" }, 
@@ -726,38 +726,38 @@
 /* 0x02ca -   714 */ { "Psalm of Mystic Shielding" }, 
 /* 0x02cb -   715 */ { "Psalm of Vitality" }, 
 /* 0x02cc -   716 */ { "Psalm of Purity" }, 
-/* 0x02cd -   717 */ { "Selo`s Accelerando" }, 
-/* 0x02ce -   718 */ { "Agilmente`s Aria of Eagles" }, 
-/* 0x02cf -   719 */ { "Shauri`s Sonorous Clouding" }, 
-/* 0x02d0 -   720 */ { "Lyssa`s Locating Lyric" }, 
-/* 0x02d1 -   721 */ { "Lyssa`s Solidarity of Vision" }, 
-/* 0x02d2 -   722 */ { "Jaxan`s Jig o` Vigor" }, 
+/* 0x02cd -   717 */ { "Selo's Accelerando" }, 
+/* 0x02ce -   718 */ { "Agilmente's Aria of Eagles" }, 
+/* 0x02cf -   719 */ { "Shauri's Sonorous Clouding" }, 
+/* 0x02d0 -   720 */ { "Lyssa's Locating Lyric" }, 
+/* 0x02d1 -   721 */ { "Lyssa's Solidarity of Vision" }, 
+/* 0x02d2 -   722 */ { "Jaxan's Jig o` Vigor" }, 
 /* 0x02d3 -   723 */ { "Cassindra's Chorus of Clarity" }, 
-/* 0x02d4 -   724 */ { "Kelin`s Lucid Lullaby" }, 
+/* 0x02d4 -   724 */ { "Kelin's Lucid Lullaby" }, 
 /* 0x02d5 -   725 */ { "Solon's Song of the Sirens" }, 
-/* 0x02d6 -   726 */ { "Syvelian`s Anti-Magic Aria" }, 
-/* 0x02d7 -   727 */ { "Alenia`s Disenchanting Melody" }, 
-/* 0x02d8 -   728 */ { "Kelin`s Lugubrious Lament" }, 
-/* 0x02d9 -   729 */ { "Tarew`s Aquatic Ayre" }, 
-/* 0x02da -   730 */ { "Denon`s Disruptive Discord" }, 
+/* 0x02d6 -   726 */ { "Syvelian's Anti-Magic Aria" }, 
+/* 0x02d7 -   727 */ { "Alenia's Disenchanting Melody" }, 
+/* 0x02d8 -   728 */ { "Kelin's Lugubrious Lament" }, 
+/* 0x02d9 -   729 */ { "Tarew's Aquatic Ayre" }, 
+/* 0x02da -   730 */ { "Denon's Disruptive Discord" }, 
 /* 0x02db -   731 */ { "Wrath of Al'Kabor" }, 
 /* 0x02dc -   732 */ { "Ice Comet" }, 
 /* 0x02dd -   733 */ { "Supernova" }, 
 /* 0x02de -   734 */ { "Jonthan's Whistling Warsong" }, 
-/* 0x02df -   735 */ { "Lyssa`s Veracious Concord" }, 
-/* 0x02e0 -   736 */ { "Denon`s Dissension" }, 
-/* 0x02e1 -   737 */ { "Lyssa`s Cataloging Libretto" }, 
-/* 0x02e2 -   738 */ { "Selo`s Consonant Chain" }, 
-/* 0x02e3 -   739 */ { "Melanie`s Mellifluous Motion" }, 
-/* 0x02e4 -   740 */ { "Vilia`s Verses of Celerity" }, 
-/* 0x02e5 -   741 */ { "Crission`s Pixie Strike" }, 
-/* 0x02e6 -   742 */ { "Denon`s Desperate Dirge" }, 
-/* 0x02e7 -   743 */ { "Tuyen`s Chant of Flame" }, 
-/* 0x02e8 -   744 */ { "Tuyen`s Chant of Frost" }, 
-/* 0x02e9 -   745 */ { "Cassindra`s Elegy" }, 
-/* 0x02ea -   746 */ { "Selo`s Chords of Cessation" }, 
+/* 0x02df -   735 */ { "Lyssa's Veracious Concord" }, 
+/* 0x02e0 -   736 */ { "Denon's Dissension" }, 
+/* 0x02e1 -   737 */ { "Lyssa's Cataloging Libretto" }, 
+/* 0x02e2 -   738 */ { "Selo's Consonant Chain" }, 
+/* 0x02e3 -   739 */ { "Melanie's Mellifluous Motion" }, 
+/* 0x02e4 -   740 */ { "Vilia's Verses of Celerity" }, 
+/* 0x02e5 -   741 */ { "Crission's Pixie Strike" }, 
+/* 0x02e6 -   742 */ { "Denon's Desperate Dirge" }, 
+/* 0x02e7 -   743 */ { "Tuyen's Chant of Flame" }, 
+/* 0x02e8 -   744 */ { "Tuyen's Chant of Frost" }, 
+/* 0x02e9 -   745 */ { "Cassindra's Elegy" }, 
+/* 0x02ea -   746 */ { "Selo's Chords of Cessation" }, 
 /* 0x02eb -   747 */ { "Verses of Victory" }, 
-/* 0x02ec -   748 */ { "Niv`s Melody of Preservation" }, 
+/* 0x02ec -   748 */ { "Niv's Melody of Preservation" }, 
 /* 0x02ed -   749 */ { "Jonthan's Provocation" }, 
 /* 0x02ee -   750 */ { "Solon's Bewitching Bravura" }, 
 /* 0x02ef -   751 */ { "Ikaav's Venom" }, 
@@ -784,11 +784,11 @@
 /* 0x0304 -   772 */ { "Chromatic Purity" }, 
 /* 0x0305 -   773 */ { "Anc: Rytan's Dirge of Death" }, 
 /* 0x0306 -   774 */ { "Soul Energy" }, 
-/* 0x0307 -   775 */ { "ActingResist" }, 
-/* 0x0308 -   776 */ { "ActingShield" }, 
-/* 0x0309 -   777 */ { "ActingGuard" }, 
-/* 0x030a -   778 */ { "GuideActing" }, 
-/* 0x030b -   779 */ { "ByeZBye" }, 
+/* 0x0307 -   775 */ { "Acting Resist" }, 
+/* 0x0308 -   776 */ { "Acting Shield" }, 
+/* 0x0309 -   777 */ { "Acting Guard" }, 
+/* 0x030a -   778 */ { "Guide Acting" }, 
+/* 0x030b -   779 */ { "Bye-Bye" }, 
 /* 0x030c -   780 */ { "ShapeChange25" }, 
 /* 0x030d -   781 */ { "ShapeChange30" }, 
 /* 0x030e -   782 */ { "ShapeChange35" }, 
@@ -806,7 +806,7 @@
 /* 0x031a -   794 */ { "Fist of Earth" }, 
 /* 0x031b -   795 */ { "Fist of Water" }, 
 /* 0x031c -   796 */ { "Fist of Sentience" }, 
-/* 0x031d -   797 */ { "GMGate" }, 
+/* 0x031d -   797 */ { "GM Gate" }, 
 /* 0x031e -   798 */ { "Cazic Shield" }, 
 /* 0x031f -   799 */ { "Test Shield" }, 
 /* 0x0320 -   800 */ { "Avatar Shield" }, 
@@ -821,7 +821,7 @@
 /* 0x0329 -   809 */ { "Cockatrice Gaze" }, 
 /* 0x032a -   810 */ { "Guide Alliance" }, 
 /* 0x032b -   811 */ { "Guide Cancel Magic" }, 
-/* 0x032c -   812 */ { "SumMonsterAttack" }, 
+/* 0x032c -   812 */ { "Summoned Monster Attack" }, 
 /* 0x032d -   813 */ { "Guide Journey" }, 
 /* 0x032e -   814 */ { "Guide Vision" }, 
 /* 0x032f -   815 */ { "Guide Health" }, 
@@ -829,19 +829,19 @@
 /* 0x0331 -   817 */ { "Guide Bolt" }, 
 /* 0x0332 -   818 */ { "Guide Memory Blur" }, 
 /* 0x0333 -   819 */ { "Sunset Home" }, 
-/* 0x0334 -   820 */ { "FlameSongOfRo" }, 
-/* 0x0335 -   821 */ { "VampEmbraceNecro" }, 
-/* 0x0336 -   822 */ { "VampEmbraceShadow" }, 
+/* 0x0334 -   820 */ { "Flame Song of Ro" }, 
+/* 0x0335 -   821 */ { "Vampiric Embrace" }, 
+/* 0x0336 -   822 */ { "Vampiric Embrace of Shadow" }, 
 /* 0x0337 -   823 */ { "Divine Might Effect" }, 
-/* 0x0338 -   824 */ { "LowerElement I" }, 
-/* 0x0339 -   825 */ { "WhirlBolt" }, 
+/* 0x0338 -   824 */ { "Lower Element I" }, 
+/* 0x0339 -   825 */ { "Whirl Bolt" }, 
 /* 0x033a -   826 */ { "Whirlwind" }, 
 /* 0x033b -   827 */ { "Devourer Tongue" }, 
 /* 0x033c -   828 */ { "Goop Poison" }, 
-/* 0x033d -   829 */ { "FireHornet" }, 
+/* 0x033d -   829 */ { "Fire Hornet" }, 
 /* 0x033e -   830 */ { "Mosquito Bite" }, 
 /* 0x033f -   831 */ { "Sathir's Gaze" }, 
-/* 0x0340 -   832 */ { "WurmBreath" }, 
+/* 0x0340 -   832 */ { "Wurm Breath" }, 
 /* 0x0341 -   833 */ { "Bond of Sathir" }, 
 /* 0x0342 -   834 */ { "Sathir's Mesmerization" }, 
 /* 0x0343 -   835 */ { "Chaos Breath" }, 
@@ -853,23 +853,23 @@
 /* 0x0349 -   841 */ { "Dragon Charm" }, 
 /* 0x034a -   842 */ { "Healing Touch" }, 
 /* 0x034b -   843 */ { "Immolating Breath" }, 
-/* 0x034c -   844 */ { "Ceticious Cloud" }, 
+/* 0x034c -   844 */ { "Edacious Cloud" }, 
 /* 0x034d -   845 */ { "Freezing Breath" }, 
 /* 0x034e -   846 */ { "Fist of Mastery" }, 
-/* 0x034f -   847 */ { "AuraofElementalMastery" }, 
+/* 0x034f -   847 */ { "Aura of Elemental Mastery" }, 
 /* 0x0350 -   848 */ { "Elemental Mastery Strike" }, 
-/* 0x0351 -   849 */ { "ElementalMasteryBlast" }, 
-/* 0x0352 -   850 */ { "Call of Earth2" }, 
+/* 0x0351 -   849 */ { "Elemental Mastery Blast" }, 
+/* 0x0352 -   850 */ { "Call of Earth II" }, 
 /* 0x0353 -   851 */ { "Shardwurm Breath" }, 
 /* 0x0354 -   852 */ { "Soul Consumption" }, 
-/* 0x0355 -   853 */ { "BurningTouch2" }, 
-/* 0x0356 -   854 */ { "BurningTouch" }, 
+/* 0x0355 -   853 */ { "Burning Touch II" }, 
+/* 0x0356 -   854 */ { "Burning Touch" }, 
 /* 0x0357 -   855 */ { "Trakanon's Touch" }, 
 /* 0x0358 -   856 */ { "Blinding Fear" }, 
 /* 0x0359 -   857 */ { "Poison Breath" }, 
 /* 0x035a -   858 */ { "Summon Golin" }, 
 /* 0x035b -   859 */ { "Lava Breath - Test" }, 
-/* 0x035c -   860 */ { "DrakeBreath" }, 
+/* 0x035c -   860 */ { "Drake Breath" }, 
 /* 0x035d -   861 */ { "Lava Breath" }, 
 /* 0x035e -   862 */ { "Frost Breath" }, 
 /* 0x035f -   863 */ { "Telekinesis" }, 
@@ -877,79 +877,79 @@
 /* 0x0361 -   865 */ { "InnoTest2" }, 
 /* 0x0362 -   866 */ { "Verdict of the Tribunal" }, 
 /* 0x0363 -   867 */ { "Matriarch Poison" }, 
-/* 0x0364 -   868 */ { "Sionachie`s Dreams" }, 
+/* 0x0364 -   868 */ { "Sionachie's Dreams" }, 
 /* 0x0365 -   869 */ { "Prismatic Flux" }, 
 /* 0x0366 -   870 */ { "Envenomed Heal" }, 
 /* 0x0367 -   871 */ { "Reckless Health" }, 
 /* 0x0368 -   872 */ { "Blinding Step" }, 
 /* 0x0369 -   873 */ { "Stalwart Regeneration" }, 
-/* 0x036a -   874 */ { "JourneymanBoots" }, 
+/* 0x036a -   874 */ { "Journeyman Boots" }, 
 /* 0x036b -   875 */ { "Summon Gate Potion" }, 
-/* 0x036c -   876 */ { "Soluan`s Vigor" }, 
-/* 0x036d -   877 */ { "HpToMana" }, 
-/* 0x036e -   878 */ { "ManaToHp" }, 
-/* 0x036f -   879 */ { "Troll`s Essence" }, 
+/* 0x036c -   876 */ { "Soluan's Vigor" }, 
+/* 0x036d -   877 */ { "Hp to Mana" }, 
+/* 0x036e -   878 */ { "Mana to Hp" }, 
+/* 0x036f -   879 */ { "Troll's Essence" }, 
 /* 0x0370 -   880 */ { "Dulsehound" }, 
 /* 0x0371 -   881 */ { "Aura of Marr" }, 
-/* 0x0372 -   882 */ { "Undead`s Recourse" }, 
+/* 0x0372 -   882 */ { "Undead's Recourse" }, 
 /* 0x0373 -   883 */ { "Potion of Assailing" }, 
 /* 0x0374 -   884 */ { "Calimony" }, 
 /* 0x0375 -   885 */ { "Graveyard Dust" }, 
-/* 0x0376 -   886 */ { "Monkey stun" }, 
+/* 0x0376 -   886 */ { "Monkey Stun" }, 
 /* 0x0377 -   887 */ { "Aura of Fatigue" }, 
 /* 0x0378 -   888 */ { "Wrath of the Ikaav" }, 
 /* 0x0379 -   889 */ { "Delusional Visions" }, 
 /* 0x037a -   890 */ { "Wrath of Trushar" }, 
 /* 0x037b -   891 */ { "Spiritual Possession" }, 
 /* 0x037c -   892 */ { "Unsummon Self" }, 
-/* 0x037d -   893 */ { "FireElementalAttack2" }, 
-/* 0x037e -   894 */ { "Invisibility versus Animal" }, 
-/* 0x037f -   895 */ { "Ink jet" }, 
+/* 0x037d -   893 */ { "Fire Elemental Attack II" }, 
+/* 0x037e -   894 */ { "Invisibility Versus Animal" }, 
+/* 0x037f -   895 */ { "Ink Jet" }, 
 /* 0x0380 -   896 */ { "Vortex" }, 
 /* 0x0381 -   897 */ { "Rotting Flesh" }, 
 /* 0x0382 -   898 */ { "Choking" }, 
-/* 0x0383 -   899 */ { "Whirl until you hurl" }, 
-/* 0x0384 -   900 */ { "ScarecrowFear" }, 
+/* 0x0383 -   899 */ { "Whirl Until You Hurl" }, 
+/* 0x0384 -   900 */ { "Scarecrow Fear" }, 
 /* 0x0385 -   901 */ { "Ghoul Root" }, 
-/* 0x0386 -   902 */ { "GelatRoot" }, 
-/* 0x0387 -   903 */ { "TerrorLifetap" }, 
+/* 0x0386 -   902 */ { "Gelatinous Root" }, 
+/* 0x0387 -   903 */ { "Terror Lifetap" }, 
 /* 0x0388 -   904 */ { "Knockback" }, 
-/* 0x0389 -   905 */ { "AvatarKnockback" }, 
-/* 0x038a -   906 */ { "SkunkSpray" }, 
-/* 0x038b -   907 */ { "DryBoneFireBurst" }, 
-/* 0x038c -   908 */ { "IceBoneFrostBurst" }, 
-/* 0x038d -   909 */ { "PlagueRatDisease" }, 
-/* 0x038e -   910 */ { "SnakeEleFireBurst" }, 
+/* 0x0389 -   905 */ { "Avatar Knockback" }, 
+/* 0x038a -   906 */ { "Skunk Spray" }, 
+/* 0x038b -   907 */ { "Dry Bone Fire Burst" }, 
+/* 0x038c -   908 */ { "Ice Bone Frost Burst" }, 
+/* 0x038d -   909 */ { "Plague Rat Disease" }, 
+/* 0x038e -   910 */ { "Snake Fire Burst" }, 
 /* 0x038f -   911 */ { "Can o` Whoop Ass" }, 
 /* 0x0390 -   912 */ { "Vampire Charm" }, 
 /* 0x0391 -   913 */ { "Vampire Touch" }, 
 /* 0x0392 -   914 */ { "Vampire Wolf Form" }, 
-/* 0x0393 -   915 */ { "SonicScream" }, 
-/* 0x0394 -   916 */ { "StoneSpiderStun" }, 
+/* 0x0393 -   915 */ { "Sonic Scream" }, 
+/* 0x0394 -   916 */ { "Stone Spider Stun" }, 
 /* 0x0395 -   917 */ { "Smolder" }, 
-/* 0x0396 -   918 */ { "SpectreLifetap" }, 
-/* 0x0397 -   919 */ { "SpectreStun" }, 
-/* 0x0398 -   920 */ { "PlagueRatDiseaseLesser" }, 
+/* 0x0396 -   918 */ { "Specter Lifetap" }, 
+/* 0x0397 -   919 */ { "Specter Stun" }, 
+/* 0x0398 -   920 */ { "Lesser Plague Rat Disease" }, 
 /* 0x0399 -   921 */ { "Summon Bill" }, 
 /* 0x039a -   922 */ { "Sonic" }, 
-/* 0x039b -   923 */ { "HarpyCharm" }, 
+/* 0x039b -   923 */ { "Harpy Charm" }, 
 /* 0x039c -   924 */ { "Burns Spell" }, 
 /* 0x039d -   925 */ { "Lycanthropy" }, 
 /* 0x039e -   926 */ { "Stone Breath" }, 
-/* 0x039f -   927 */ { "FireElementalAura" }, 
-/* 0x03a0 -   928 */ { "AirElementalInvisibility" }, 
+/* 0x039f -   927 */ { "Fire Elemental Aura" }, 
+/* 0x03a0 -   928 */ { "Air Elemental Invisibility" }, 
 /* 0x03a1 -   929 */ { "Harm Touch NPC" }, 
 /* 0x03a2 -   930 */ { "Vampire Aura" }, 
 /* 0x03a3 -   931 */ { "Life Drain" }, 
-/* 0x03a4 -   932 */ { "BarbedBones" }, 
+/* 0x03a4 -   932 */ { "Barbed Bones" }, 
 /* 0x03a5 -   933 */ { "Mort Drowsy" }, 
 /* 0x03a6 -   934 */ { "Screaming Mace" }, 
 /* 0x03a7 -   935 */ { "Choking Wind" }, 
 /* 0x03a8 -   936 */ { "Blood Claw" }, 
 /* 0x03a9 -   937 */ { "Fungus Spores" }, 
 /* 0x03aa -   938 */ { "Darkness" }, 
-/* 0x03ab -   939 */ { "EyeLevitate" }, 
-/* 0x03ac -   940 */ { "ManaConvert" }, 
+/* 0x03ab -   939 */ { "Eye Levitate" }, 
+/* 0x03ac -   940 */ { "Mana Convert" }, 
 /* 0x03ad -   941 */ { "Desperate Hope" }, 
 /* 0x03ae -   942 */ { "Ghoul Drain" }, 
 /* 0x03af -   943 */ { "Mana Drain" }, 
@@ -962,7 +962,7 @@
 /* 0x03b6 -   950 */ { "Restore Sight" }, 
 /* 0x03b7 -   951 */ { "Fiery Death" }, 
 /* 0x03b8 -   952 */ { "Frosty Death" }, 
-/* 0x03b9 -   953 */ { "FrostElementalAura" }, 
+/* 0x03b9 -   953 */ { "Frost Elemental Aura" }, 
 /* 0x03ba -   954 */ { "Slow" }, 
 /* 0x03bb -   955 */ { "Beholder Dispel" }, 
 /* 0x03bc -   956 */ { "Panic" }, 
@@ -975,10 +975,10 @@
 /* 0x03c3 -   963 */ { "Extended Regeneration" }, 
 /* 0x03c4 -   964 */ { "Resistance to Magic" }, 
 /* 0x03c5 -   965 */ { "Obsidian Shatter" }, 
-/* 0x03c6 -   966 */ { "FireElementalAttack" }, 
-/* 0x03c7 -   967 */ { "AirElementalAttack" }, 
-/* 0x03c8 -   968 */ { "WaterElementalAttack" }, 
-/* 0x03c9 -   969 */ { "EarthElementalAttack" }, 
+/* 0x03c6 -   966 */ { "Fire Elemental Attack" }, 
+/* 0x03c7 -   967 */ { "Air Elemental Attack" }, 
+/* 0x03c8 -   968 */ { "Water Elemental Attack" }, 
+/* 0x03c9 -   969 */ { "Earth Elemental Attack" }, 
 /* 0x03ca -   970 */ { "Levitation" }, 
 /* 0x03cb -   971 */ { "Boiling Blood" }, 
 /* 0x03cc -   972 */ { "Spirit of the Azure Flame" }, 
@@ -987,7 +987,7 @@
 /* 0x03cf -   975 */ { "Spirit of the Sapphire Flame" }, 
 /* 0x03d0 -   976 */ { "Phobocancel" }, 
 /* 0x03d1 -   977 */ { "Scareling Step" }, 
-/* 0x03d2 -   978 */ { "FrostAOE" }, 
+/* 0x03d2 -   978 */ { "Frost Effect" }, 
 /* 0x03d3 -   979 */ { "Spine Chill" }, 
 /* 0x03d4 -   980 */ { "Mana Sink" }, 
 /* 0x03d5 -   981 */ { "Dragon Roar" }, 
@@ -1018,7 +1018,7 @@
 /* 0x03ee -  1006 */ { "Bixie Poison" }, 
 /* 0x03ef -  1007 */ { "Rabies" }, 
 /* 0x03f0 -  1008 */ { "Disease" }, 
-/* 0x03f1 -  1009 */ { "FireBeetleSpit" }, 
+/* 0x03f1 -  1009 */ { "Fire Beetle Spit" }, 
 /* 0x03f2 -  1010 */ { "Clockwork Poison" }, 
 /* 0x03f3 -  1011 */ { "Wasp Poison" }, 
 /* 0x03f4 -  1012 */ { "Strong Wasp Poison" }, 
@@ -1026,9 +1026,9 @@
 /* 0x03f6 -  1014 */ { "Strong Disease" }, 
 /* 0x03f7 -  1015 */ { "Infectious Spores" }, 
 /* 0x03f8 -  1016 */ { "Burrowing Scarab" }, 
-/* 0x03f9 -  1017 */ { "Fishnova" }, 
-/* 0x03fa -  1018 */ { "InnoruuksPresence" }, 
-/* 0x03fb -  1019 */ { "InnoruuksWrath" }, 
+/* 0x03f9 -  1017 */ { "Fish Nova" }, 
+/* 0x03fa -  1018 */ { "Innoruuk's Presence" }, 
+/* 0x03fb -  1019 */ { "Innoruuk's Wrath" }, 
 /* 0x03fc -  1020 */ { "Air Elemental Strike" }, 
 /* 0x03fd -  1021 */ { "Water Elemental Strike" }, 
 /* 0x03fe -  1022 */ { "Earth Elemental Strike" }, 
@@ -1075,7 +1075,7 @@
 /* 0x0427 -  1063 */ { "Shield of Life" }, 
 /* 0x0428 -  1064 */ { "Enveloping Entropy" }, 
 /* 0x0429 -  1065 */ { "Lifeshock" }, 
-/* 0x042a -  1066 */ { "Orxkras Bane" }, 
+/* 0x042a -  1066 */ { "Orxkra's Bane" }, 
 /* 0x042b -  1067 */ { "Mark of the Plague Lords" }, 
 /* 0x042c -  1068 */ { "Death Strike" }, 
 /* 0x042d -  1069 */ { "Fwexar's Rage" }, 
@@ -1215,11 +1215,11 @@
 /* 0x04b3 -  1203 */ { "ShapeChange40" }, 
 /* 0x04b4 -  1204 */ { "ShapeChange45" }, 
 /* 0x04b5 -  1205 */ { "ShapeChange50" }, 
-/* 0x04b6 -  1206 */ { "ActingResist" }, 
-/* 0x04b7 -  1207 */ { "ActingShield" }, 
-/* 0x04b8 -  1208 */ { "ActingGuard" }, 
-/* 0x04b9 -  1209 */ { "GuideActing" }, 
-/* 0x04ba -  1210 */ { "ByeZBye" }, 
+/* 0x04b6 -  1206 */ { "Acting Resist" }, 
+/* 0x04b7 -  1207 */ { "Acting Shield" }, 
+/* 0x04b8 -  1208 */ { "Acting Guard" }, 
+/* 0x04b9 -  1209 */ { "Guide Acting" }, 
+/* 0x04ba -  1210 */ { "Bye-Bye" }, 
 /* 0x04bb -  1211 */ { "Guide Cancel Magic" }, 
 /* 0x04bc -  1212 */ { "Guide Journey" }, 
 /* 0x04bd -  1213 */ { "Guide Vision" }, 
@@ -1279,7 +1279,7 @@
 /* 0x04f3 -  1267 */ { "Siphon" }, 
 /* 0x04f4 -  1268 */ { "Mistmoore Charm" }, 
 /* 0x04f5 -  1269 */ { "Fangol's Breath" }, 
-/* 0x04f6 -  1270 */ { "Ive Got Candy" }, 
+/* 0x04f6 -  1270 */ { "I've Got Candy" }, 
 /* 0x04f7 -  1271 */ { "Deranged Wonderment" }, 
 /* 0x04f8 -  1272 */ { "Rekeklication" }, 
 /* 0x04f9 -  1273 */ { "Grubs" }, 
@@ -1296,7 +1296,7 @@
 /* 0x0504 -  1284 */ { "Valiant Companion" }, 
 /* 0x0505 -  1285 */ { "Summon Companion" }, 
 /* 0x0506 -  1286 */ { "Expedience" }, 
-/* 0x0507 -  1287 */ { "Cassindra`s Chant of Clarity" }, 
+/* 0x0507 -  1287 */ { "Cassindra's Chant of Clarity" }, 
 /* 0x0508 -  1288 */ { "Divine Glory" }, 
 /* 0x0509 -  1289 */ { "Strengthen Death" }, 
 /* 0x050a -  1290 */ { "Chloroblast" }, 
@@ -1323,7 +1323,7 @@
 /* 0x051f -  1311 */ { "Hsagra's Wrath" }, 
 /* 0x0520 -  1312 */ { "Scarab Storm" }, 
 /* 0x0521 -  1313 */ { "Festering Sores" }, 
-/* 0x0522 -  1314 */ { "SpectraStun" }, 
+/* 0x0522 -  1314 */ { "Spectra Stun" }, 
 /* 0x0523 -  1315 */ { "Lethargy" }, 
 /* 0x0524 -  1316 */ { "Vampiric Drain" }, 
 /* 0x0525 -  1317 */ { "Repulse" }, 
@@ -1337,9 +1337,9 @@
 /* 0x052d -  1325 */ { "Combine Gate" }, 
 /* 0x052e -  1326 */ { "Ring of the Combines" }, 
 /* 0x052f -  1327 */ { "Aura of Battle" }, 
-/* 0x0530 -  1328 */ { "Agilmente`s Aria of Eagles" }, 
-/* 0x0531 -  1329 */ { "Angstlich`s Appalling Screech" }, 
-/* 0x0532 -  1330 */ { "Selo`s Song of Travel" }, 
+/* 0x0530 -  1328 */ { "Agilmente's Aria of Eagles" }, 
+/* 0x0531 -  1329 */ { "Angstlich's Appalling Screech" }, 
+/* 0x0532 -  1330 */ { "Selo's Song of Travel" }, 
 /* 0x0533 -  1331 */ { "Kilva's Skin of Flame" }, 
 /* 0x0534 -  1332 */ { "Cannibalize IV" }, 
 /* 0x0535 -  1333 */ { "Bone Shatter" }, 
@@ -1349,10 +1349,10 @@
 /* 0x0539 -  1337 */ { "Translocate: Tox" }, 
 /* 0x053a -  1338 */ { "Translocate: North" }, 
 /* 0x053b -  1339 */ { "Translocate: Combine" }, 
-/* 0x053c -  1340 */ { "TravelerBoots" }, 
+/* 0x053c -  1340 */ { "Traveler Boots" }, 
 /* 0x053d -  1341 */ { "Speechless Fright" }, 
 /* 0x053e -  1342 */ { "Test GLT" }, 
-/* 0x053f -  1343 */ { "NPCAegolism" }, 
+/* 0x053f -  1343 */ { "NPC Aegolism" }, 
 /* 0x0540 -  1344 */ { "Test GACD" }, 
 /* 0x0541 -  1345 */ { "Test GATD" }, 
 /* 0x0542 -  1346 */ { "Test GSTRD" }, 
@@ -1420,7 +1420,7 @@
 /* 0x0580 -  1408 */ { "Gift of Magic" }, 
 /* 0x0581 -  1409 */ { "Gift of Insight" }, 
 /* 0x0582 -  1410 */ { "Gift of Brilliance" }, 
-/* 0x0583 -  1411 */ { "Improved Invis to Undead" }, 
+/* 0x0583 -  1411 */ { "Improved Invisibility to Undead" }, 
 /* 0x0584 -  1412 */ { "Chilling Embrace" }, 
 /* 0x0585 -  1413 */ { "Corporeal Empathy" }, 
 /* 0x0586 -  1414 */ { "Augmentation of Death" }, 
@@ -1428,7 +1428,7 @@
 /* 0x0588 -  1416 */ { "Arch Lich" }, 
 /* 0x0589 -  1417 */ { "Iceclad Gate" }, 
 /* 0x058a -  1418 */ { "Iceclad Portal" }, 
-/* 0x058b -  1419 */ { "O'Keils Flickering Flame" }, 
+/* 0x058b -  1419 */ { "O`Keil's Flickering Flame" }, 
 /* 0x058c -  1420 */ { "Invisibility to Undead" }, 
 /* 0x058d -  1421 */ { "Enticement of Flame" }, 
 /* 0x058e -  1422 */ { "Translocate" }, 
@@ -1504,10 +1504,10 @@
 /* 0x05d4 -  1492 */ { "Thunder Blast" }, 
 /* 0x05d5 -  1493 */ { "Acid Jet" }, 
 /* 0x05d6 -  1494 */ { "Flame Jet" }, 
-/* 0x05d7 -  1495 */ { "Rodricks Gift" }, 
+/* 0x05d7 -  1495 */ { "Rodrick's Gift" }, 
 /* 0x05d8 -  1496 */ { "Immolating Breath II" }, 
 /* 0x05d9 -  1497 */ { "Deadly Velium Poison" }, 
-/* 0x05da -  1498 */ { "Doljons Rage" }, 
+/* 0x05da -  1498 */ { "Doljon's Rage" }, 
 /* 0x05db -  1499 */ { "Aura of Battle" }, 
 /* 0x05dc -  1500 */ { "Wimpy Healing" }, 
 /* 0x05dd -  1501 */ { "Diminution" }, 
@@ -1665,7 +1665,7 @@
 /* 0x0675 -  1653 */ { "Jyll's Static Pulse" }, 
 /* 0x0676 -  1654 */ { "Jyll's Zephyr of Ice" }, 
 /* 0x0677 -  1655 */ { "Jyll's Wave of Heat" }, 
-/* 0x0678 -  1656 */ { "Thunderbold" }, 
+/* 0x0678 -  1656 */ { "Thunderbolt" }, 
 /* 0x0679 -  1657 */ { "Winds of Gelid" }, 
 /* 0x067a -  1658 */ { "Sunstrike" }, 
 /* 0x067b -  1659 */ { "Scintillation" }, 
@@ -1714,7 +1714,7 @@
 /* 0x06a6 -  1702 */ { "Tashanian" }, 
 /* 0x06a7 -  1703 */ { "Asphyxiate" }, 
 /* 0x06a8 -  1704 */ { "Wind of Tashanian" }, 
-/* 0x06a9 -  1705 */ { "Boltran`s Agacerie" }, 
+/* 0x06a9 -  1705 */ { "Boltran's Agacerie" }, 
 /* 0x06aa -  1706 */ { "Boltran's Agacerie" }, 
 /* 0x06ab -  1707 */ { "Dictate" }, 
 /* 0x06ac -  1708 */ { "Aanya's Quickening" }, 
@@ -1756,24 +1756,24 @@
 /* 0x06d0 -  1744 */ { "Harvest" }, 
 /* 0x06d1 -  1745 */ { "Vengeance of the Glades" }, 
 /* 0x06d2 -  1746 */ { "Power of the Forests" }, 
-/* 0x06d3 -  1747 */ { "Brusco`s Bombastic Bellow" }, 
+/* 0x06d3 -  1747 */ { "Brusco's Bombastic Bellow" }, 
 /* 0x06d4 -  1748 */ { "Angstlich's Assonance" }, 
 /* 0x06d5 -  1749 */ { "Kazumi's Note of Preservation" }, 
-/* 0x06d6 -  1750 */ { "Selo`s Song of Travel" }, 
-/* 0x06d7 -  1751 */ { "Largo`s Assonant Binding" }, 
-/* 0x06d8 -  1752 */ { "Nillipus` March of the Wee" }, 
+/* 0x06d6 -  1750 */ { "Selo's Song of Travel" }, 
+/* 0x06d7 -  1751 */ { "Largo's Assonant Binding" }, 
+/* 0x06d8 -  1752 */ { "Nillipus' March of the Wee" }, 
 /* 0x06d9 -  1753 */ { "Song of Twilight" }, 
 /* 0x06da -  1754 */ { "Song of Dawn" }, 
 /* 0x06db -  1755 */ { "Song of Highsun" }, 
 /* 0x06dc -  1756 */ { "Song of Midnight" }, 
-/* 0x06dd -  1757 */ { "Vilia`s Chorus of Celerity" }, 
-/* 0x06de -  1758 */ { "Selo`s Assonant Strain" }, 
+/* 0x06dd -  1757 */ { "Vilia's Chorus of Celerity" }, 
+/* 0x06de -  1758 */ { "Selo's Assonant Strain" }, 
 /* 0x06df -  1759 */ { "Cantata of Replenishment" }, 
-/* 0x06e0 -  1760 */ { "McVaxius` Rousing Rondo" }, 
+/* 0x06e0 -  1760 */ { "McVaxius' Rousing Rondo" }, 
 /* 0x06e1 -  1761 */ { "Cassindra's Insipid Ditty" }, 
 /* 0x06e2 -  1762 */ { "Jonthan's Inspiration" }, 
-/* 0x06e3 -  1763 */ { "Niv`s Harmonic" }, 
-/* 0x06e4 -  1764 */ { "Denon`s Bereavement" }, 
+/* 0x06e3 -  1763 */ { "Niv's Harmonic" }, 
+/* 0x06e4 -  1764 */ { "Denon's Bereavement" }, 
 /* 0x06e5 -  1765 */ { "Solon's Charismatic Concord" }, 
 /* 0x06e6 -  1766 */ { "Distraction" }, 
 /* 0x06e7 -  1767 */ { "Bonds of Tunare" }, 
@@ -1934,7 +1934,7 @@
 /* 0x0782 -  1922 */ { "Acting Spirit II" }, 
 /* 0x0783 -  1923 */ { "ShapeChange55" }, 
 /* 0x0784 -  1924 */ { "ShapeChange60" }, 
-/* 0x0785 -  1925 */ { "Captain Nalots Quickening" }, 
+/* 0x0785 -  1925 */ { "Captain Nalot's Quickening" }, 
 /* 0x0786 -  1926 */ { "Wrath of Nature" }, 
 /* 0x0787 -  1927 */ { "Seething Fury" }, 
 /* 0x0788 -  1928 */ { "Earthcall" }, 
@@ -1964,7 +1964,7 @@
 /* 0x07a0 -  1952 */ { "Strike of Thunder" }, 
 /* 0x07a1 -  1953 */ { "Mastodon Stomp" }, 
 /* 0x07a2 -  1954 */ { "Devour Soul" }, 
-/* 0x07a3 -  1955 */ { "DrakeBreathBig" }, 
+/* 0x07a3 -  1955 */ { "Burning Drake Breath" }, 
 /* 0x07a4 -  1956 */ { "Putrefy Flesh" }, 
 /* 0x07a5 -  1957 */ { "Holy Shock" }, 
 /* 0x07a6 -  1958 */ { "Cacophony" }, 
@@ -1992,7 +1992,7 @@
 /* 0x07bc -  1980 */ { "Fellspine" }, 
 /* 0x07bd -  1981 */ { "Summon Throwing Hammer" }, 
 /* 0x07be -  1982 */ { "Prayer" }, 
-/* 0x07bf -  1983 */ { "Unsheath Dagger" }, 
+/* 0x07bf -  1983 */ { "Unsheathe Dagger" }, 
 /* 0x07c0 -  1984 */ { "Open Red Box" }, 
 /* 0x07c1 -  1985 */ { "Open Blue Box" }, 
 /* 0x07c2 -  1986 */ { "Open Green Box" }, 
@@ -2016,7 +2016,7 @@
 /* 0x07d4 -  2004 */ { "Produce Wrench" }, 
 /* 0x07d5 -  2005 */ { "Nature's Holy Wrath" }, 
 /* 0x07d6 -  2006 */ { "Static" }, 
-/* 0x07d7 -  2007 */ { "Selo`s Song of Travel" }, 
+/* 0x07d7 -  2007 */ { "Selo's Song of Travel" }, 
 /* 0x07d8 -  2008 */ { "Fungal Regrowth" }, 
 /* 0x07d9 -  2009 */ { "All Your Base Are Belong To Us" }, 
 /* 0x07da -  2010 */ { "Gathering of the Mind" }, 
@@ -2078,7 +2078,7 @@
 /* 0x0812 -  2066 */ { "Protection of the Vah Shir" }, 
 /* 0x0813 -  2067 */ { "Blessing of the Vah Shir" }, 
 /* 0x0814 -  2068 */ { "Blast of Frost" }, 
-/* 0x0815 -  2069 */ { "Curse of Sshraezha" }, 
+/* 0x0815 -  2069 */ { "Curse of Ssraeshza" }, 
 /* 0x0816 -  2070 */ { "Marauder's Wrath" }, 
 /* 0x0817 -  2071 */ { "Tempest Wing's Embrace" }, 
 /* 0x0818 -  2072 */ { "Spiritual Discipline" }, 
@@ -2132,7 +2132,7 @@
 /* 0x0848 -  2120 */ { "Ancient: Eternal Rapture" }, 
 /* 0x0849 -  2121 */ { "Ancient: Chaotic Visions" }, 
 /* 0x084a -  2122 */ { "Ancient: Gift of Aegolism" }, 
-/* 0x084b -  2123 */ { "Erud Crossing Portal" }, 
+/* 0x084b -  2123 */ { "Erud's Crossing Portal" }, 
 /* 0x084c -  2124 */ { "Marauder's Mire Portal" }, 
 /* 0x084d -  2125 */ { "Ancient: Legacy of Blades" }, 
 /* 0x084e -  2126 */ { "Ancient: Starfire of Ro" }, 
@@ -2268,7 +2268,7 @@
 /* 0x08d0 -  2256 */ { "Coils of Temptation" }, 
 /* 0x08d1 -  2257 */ { "Bewildering Dementia" }, 
 /* 0x08d2 -  2258 */ { "Frigid Dominion" }, 
-/* 0x08d3 -  2259 */ { "Discorded Terror" }, 
+/* 0x08d3 -  2259 */ { "Discordant Terror" }, 
 /* 0x08d4 -  2260 */ { "Entrapment of Dreams" }, 
 /* 0x08d5 -  2261 */ { "Frozen Torrent" }, 
 /* 0x08d6 -  2262 */ { "Annulling Spirit" }, 
@@ -2327,7 +2327,7 @@
 /* 0x090b -  2315 */ { "Searing Heat" }, 
 /* 0x090c -  2316 */ { "Tempest Guard" }, 
 /* 0x090d -  2317 */ { "Wind of Renewal" }, 
-/* 0x090e -  2318 */ { "Cromastorm" }, 
+/* 0x090e -  2318 */ { "Chromastorm" }, 
 /* 0x090f -  2319 */ { "Weather Rocket" }, 
 /* 0x0910 -  2320 */ { "Happy Dragon" }, 
 /* 0x0911 -  2321 */ { "Energy Burst" }, 
@@ -2547,7 +2547,7 @@
 /* 0x09e7 -  2535 */ { "Summon Elemental Blanket" }, 
 /* 0x09e8 -  2536 */ { "Transon's Elemental Infusion" }, 
 /* 0x09e9 -  2537 */ { "Veil of Elements" }, 
-/* 0x09ea -  2538 */ { "Mass Mystical Transvergance" }, 
+/* 0x09ea -  2538 */ { "Mass Mystical Transvergence" }, 
 /* 0x09eb -  2539 */ { "Transon's Phantasmal Protection" }, 
 /* 0x09ec -  2540 */ { "Shock of Fiery Blades" }, 
 /* 0x09ed -  2541 */ { "Focus Death" }, 
@@ -2560,7 +2560,7 @@
 /* 0x09f4 -  2548 */ { "Crippling Claudication" }, 
 /* 0x09f5 -  2549 */ { "Mind Wrack" }, 
 /* 0x09f6 -  2550 */ { "Zevfeer's Theft of Vitae" }, 
-/* 0x09f7 -  2551 */ { "O'Keils Embers" }, 
+/* 0x09f7 -  2551 */ { "O`Keil's Embers" }, 
 /* 0x09f8 -  2552 */ { "Garrison's Mighty Mana Shock" }, 
 /* 0x09f9 -  2553 */ { "Minor Familiar" }, 
 /* 0x09fa -  2554 */ { "Elnerick's Entombment of Ice" }, 
@@ -2614,7 +2614,7 @@
 /* 0x0a2a -  2602 */ { "Song of Sustenance" }, 
 /* 0x0a2b -  2603 */ { "Amplification" }, 
 /* 0x0a2c -  2604 */ { "Katta's Song of Sword Dancing" }, 
-/* 0x0a2d -  2605 */ { "Selo`s Accelerating Chorus" }, 
+/* 0x0a2d -  2605 */ { "Selo's Accelerating Chorus" }, 
 /* 0x0a2e -  2606 */ { "Battlecry of the Vah Shir" }, 
 /* 0x0a2f -  2607 */ { "Elemental Chorus" }, 
 /* 0x0a30 -  2608 */ { "Purifying Chorus" }, 
@@ -2720,12 +2720,12 @@
 /* 0x0a94 -  2708 */ { "Journey: North" }, 
 /* 0x0a95 -  2709 */ { "Journey: Combine" }, 
 /* 0x0a96 -  2710 */ { "Trickster's Torment" }, 
-/* 0x0a97 -  2711 */ { "Trickster's TormentSK" }, 
+/* 0x0a97 -  2711 */ { "Trickster's Torment SK" }, 
 /* 0x0a98 -  2712 */ { "Concoction of Ice III" }, 
 /* 0x0a99 -  2713 */ { "Concoction of Ice IV" }, 
 /* 0x0a9a -  2714 */ { "Elixir of the Beast" }, 
 /* 0x0a9b -  2715 */ { "Stone Daze" }, 
-/* 0x0a9c -  2716 */ { "Mystical Transvergance" }, 
+/* 0x0a9c -  2716 */ { "Mystical Transvergence" }, 
 /* 0x0a9d -  2717 */ { "Mental Corruption Strike" }, 
 /* 0x0a9e -  2718 */ { "Scream of Death Strike" }, 
 /* 0x0a9f -  2719 */ { "Rich's Test spell" }, 
@@ -2736,7 +2736,7 @@
 /* 0x0aa4 -  2724 */ { "Spirit of Vermin Strike" }, 
 /* 0x0aa5 -  2725 */ { "Spirit of Wind Strike" }, 
 /* 0x0aa6 -  2726 */ { "Spirit of Storm Strike" }, 
-/* 0x0aa7 -  2727 */ { "Vampyre Invis" }, 
+/* 0x0aa7 -  2727 */ { "Vampyre Invisibility" }, 
 /* 0x0aa8 -  2728 */ { "Portal Effect" }, 
 /* 0x0aa9 -  2729 */ { "Condemnation of Nife" }, 
 /* 0x0aaa -  2730 */ { "Stone Feet" }, 
@@ -2797,7 +2797,7 @@
 /* 0x0ae1 -  2785 */ { "Screech Immunity" }, 
 /* 0x0ae2 -  2786 */ { "In Irons" }, 
 /* 0x0ae3 -  2787 */ { "Rhag`Zhezum's Deathly Embrace" }, 
-/* 0x0ae4 -  2788 */ { "Breath of Rag'Mozdezh" }, 
+/* 0x0ae4 -  2788 */ { "Breath of Rhag`Mozdezh" }, 
 /* 0x0ae5 -  2789 */ { "Air Elemental Form I" }, 
 /* 0x0ae6 -  2790 */ { "Air Elemental Form II" }, 
 /* 0x0ae7 -  2791 */ { "Air Elemental Form III" }, 
@@ -2837,14 +2837,14 @@
 /* 0x0b09 -  2825 */ { "Applied Singularity" }, 
 /* 0x0b0a -  2826 */ { "Illusion: Vah Shir" }, 
 /* 0x0b0b -  2827 */ { "Golem Smash" }, 
-/* 0x0b0c -  2828 */ { "FrenzyNova" }, 
+/* 0x0b0c -  2828 */ { "Frenzy Nova" }, 
 /* 0x0b0d -  2829 */ { "Golem Smash2" }, 
 /* 0x0b0e -  2830 */ { "Annul Self" }, 
 /* 0x0b0f -  2831 */ { "Golem Coat" }, 
 /* 0x0b10 -  2832 */ { "Tendrils of Madness" }, 
-/* 0x0b11 -  2833 */ { "AdvisorNova" }, 
+/* 0x0b11 -  2833 */ { "Advisor Nova" }, 
 /* 0x0b12 -  2834 */ { "Blade Dance" }, 
-/* 0x0b13 -  2835 */ { "Blade DanceSK" }, 
+/* 0x0b13 -  2835 */ { "Blade Dance SK" }, 
 /* 0x0b14 -  2836 */ { "Grimling Comet" }, 
 /* 0x0b15 -  2837 */ { "Grimling Death Chant" }, 
 /* 0x0b16 -  2838 */ { "Grimling Possession" }, 
@@ -2866,8 +2866,8 @@
 /* 0x0b26 -  2854 */ { "Grow" }, 
 /* 0x0b27 -  2855 */ { "Divine Endurance" }, 
 /* 0x0b28 -  2856 */ { "Fungal Net" }, 
-/* 0x0b29 -  2857 */ { "BetaAcrylia" }, 
-/* 0x0b2a -  2858 */ { "AcryliaKB" }, 
+/* 0x0b29 -  2857 */ { "Beta Acrylia" }, 
+/* 0x0b2a -  2858 */ { "Acrylia KB" }, 
 /* 0x0b2b -  2859 */ { "Touch of Vinitras" }, 
 /* 0x0b2c -  2860 */ { "Shackles" }, 
 /* 0x0b2d -  2861 */ { "BetaAcrylia2" }, 
@@ -2958,7 +2958,7 @@
 /* 0x0b82 -  2946 */ { "Remove Curse" }, 
 /* 0x0b83 -  2947 */ { "Vas Ren Slow" }, 
 /* 0x0b84 -  2948 */ { "Vas Ren Slow" }, 
-/* 0x0b85 -  2949 */ { "Hinderance of the Vas Ren" }, 
+/* 0x0b85 -  2949 */ { "Hindrance of the Vas Ren" }, 
 /* 0x0b86 -  2950 */ { "Grol Baku Strike" }, 
 /* 0x0b87 -  2951 */ { "Grol Baku Strike" }, 
 /* 0x0b88 -  2952 */ { "Strike of the Grol Baku" }, 
@@ -3049,14 +3049,14 @@
 /* 0x0bdd -  3037 */ { "Wrath of Fire" }, 
 /* 0x0bde -  3038 */ { "Wrath of Wind" }, 
 /* 0x0bdf -  3039 */ { "Protection of the Wild" }, 
-/* 0x0be0 -  3040 */ { "Belt of Magi'Kot" }, 
+/* 0x0be0 -  3040 */ { "Belt of Magi`Kot" }, 
 /* 0x0be1 -  3041 */ { "Blade of Walnan" }, 
 /* 0x0be2 -  3042 */ { "Fist of Ixiblat" }, 
 /* 0x0be3 -  3043 */ { "Blade of The Kedge" }, 
-/* 0x0be4 -  3044 */ { "Girdle of Magi'Kot" }, 
+/* 0x0be4 -  3044 */ { "Girdle of Magi`Kot" }, 
 /* 0x0be5 -  3045 */ { "Talisman of Return" }, 
 /* 0x0be6 -  3046 */ { "Talisman Gate" }, 
-/* 0x0be7 -  3047 */ { "Kazad`s Mark" }, 
+/* 0x0be7 -  3047 */ { "Kazad's Mark" }, 
 /* 0x0be8 -  3048 */ { "Plague Silk" }, 
 /* 0x0be9 -  3049 */ { "Infernal Darkness" }, 
 /* 0x0bea -  3050 */ { "Ravaging Rage of the Fiends" }, 
@@ -3097,18 +3097,18 @@
 /* 0x0c0d -  3085 */ { "Chromosphere" }, 
 /* 0x0c0e -  3086 */ { "Insanity Storm" }, 
 /* 0x0c0f -  3087 */ { "Cazic Touch" }, 
-/* 0x0c10 =  3088 */ { NULL, },
-/* 0x0c11 =  3089 */ { NULL, },
-/* 0x0c12 =  3090 */ { NULL, },
-/* 0x0c13 =  3091 */ { NULL, },
-/* 0x0c14 =  3092 */ { NULL, },
-/* 0x0c15 -  3093 */ { "Wafarer's Crucible" }, 
-/* 0x0c16 =  3094 */ { NULL, },
-/* 0x0c17 =  3095 */ { NULL, },
-/* 0x0c18 =  3096 */ { NULL, },
-/* 0x0c19 =  3097 */ { NULL, },
-/* 0x0c1a =  3098 */ { NULL, },
-/* 0x0c1b =  3099 */ { NULL, },
+/* 0x0c10 -  3088 */ { "Steal Strength" }, 
+/* 0x0c11 -  3089 */ { "Retributive Fire" }, 
+/* 0x0c12 -  3090 */ { "Call of All Hallow's Eve" }, 
+/* 0x0c13 -  3091 */ { "Gorilla Prod" }, 
+/* 0x0c14 -  3092 */ { "Initiate's Standard of Anger I" }, 
+/* 0x0c15 -  3093 */ { "Wayfarer's Crucible" }, 
+/* 0x0c16 -  3094 */ { "Initiate's Standard of Anger II" }, 
+/* 0x0c17 -  3095 */ { "Initiate's Standard of Anger III" }, 
+/* 0x0c18 -  3096 */ { "Initiate's Standard of Anger IV" }, 
+/* 0x0c19 -  3097 */ { "Apprentice's Standard of Anger I" }, 
+/* 0x0c1a -  3098 */ { "Apprentice's Standard of Anger II" }, 
+/* 0x0c1b -  3099 */ { "Apprentice's Standard of Anger III" }, 
 /* 0x0c1c -  3100 */ { "Mark of Retaliation" }, 
 /* 0x0c1d -  3101 */ { "Enchantment of Destruction" }, 
 /* 0x0c1e -  3102 */ { "Focus of Flame" }, 
@@ -3156,9 +3156,9 @@
 /* 0x0c48 -  3144 */ { "Spirit of Celestial Rage" }, 
 /* 0x0c49 -  3145 */ { "Spirit of Unbridled Rage" }, 
 /* 0x0c4a -  3146 */ { "Spirit of Unbridled Rage" }, 
-/* 0x0c4b =  3147 */ { NULL, },
-/* 0x0c4c =  3148 */ { NULL, },
-/* 0x0c4d =  3149 */ { NULL, },
+/* 0x0c4b -  3147 */ { "Apprentice's Standard of Anger IV" }, 
+/* 0x0c4c -  3148 */ { "Neophyte's Standard of Anger I" }, 
+/* 0x0c4d -  3149 */ { "Neophyte's Standard of Anger II" }, 
 /* 0x0c4e -  3150 */ { "Direption of Dreams" }, 
 /* 0x0c4f -  3151 */ { "Nightmare Stasis" }, 
 /* 0x0c50 -  3152 */ { "Will of Saryrn" }, 
@@ -3197,9 +3197,9 @@
 /* 0x0c71 -  3185 */ { "Flight of Eagles" }, 
 /* 0x0c72 -  3186 */ { "Yaulp VI" }, 
 /* 0x0c73 -  3187 */ { "Sermon of Penitence" }, 
-/* 0x0c74 -  3188 */ { "Rod of Mystical Transvergance" }, 
+/* 0x0c74 -  3188 */ { "Rod of Mystical Transvergence" }, 
 /* 0x0c75 -  3189 */ { "Tears of Arlyxir" }, 
-/* 0x0c76 -  3190 */ { "Crusader`s Touch" }, 
+/* 0x0c76 -  3190 */ { "Crusader's Touch" }, 
 /* 0x0c77 -  3191 */ { "Shock of Magic" }, 
 /* 0x0c78 -  3192 */ { "Earthen Roots" }, 
 /* 0x0c79 -  3193 */ { "EarthElementalStrike2" }, 
@@ -3220,16 +3220,16 @@
 /* 0x0c88 -  3208 */ { "Summon Spiked Ring" }, 
 /* 0x0c89 -  3209 */ { "Summon Glowing Bauble" }, 
 /* 0x0c8a -  3210 */ { "Summon Jewelry Bag" }, 
-/* 0x0c8b =  3211 */ { NULL, },
-/* 0x0c8c =  3212 */ { NULL, },
-/* 0x0c8d =  3213 */ { NULL, },
-/* 0x0c8e =  3214 */ { NULL, },
-/* 0x0c8f =  3215 */ { NULL, },
-/* 0x0c90 =  3216 */ { NULL, },
-/* 0x0c91 =  3217 */ { NULL, },
-/* 0x0c92 =  3218 */ { NULL, },
-/* 0x0c93 =  3219 */ { NULL, },
-/* 0x0c94 =  3220 */ { NULL, },
+/* 0x0c8b -  3211 */ { "Neophyte's Standard of Anger III" }, 
+/* 0x0c8c -  3212 */ { "Neophyte's Standard of Anger IV" }, 
+/* 0x0c8d -  3213 */ { "Journeyman's Standard of Anger I" }, 
+/* 0x0c8e -  3214 */ { "Journeyman's Standard of Anger II" }, 
+/* 0x0c8f -  3215 */ { "Journeyman's Standard of Anger III" }, 
+/* 0x0c90 -  3216 */ { "Journeyman's Standard of Anger IV" }, 
+/* 0x0c91 -  3217 */ { "Adept's Standard of Anger I" }, 
+/* 0x0c92 -  3218 */ { "Adept's Standard of Anger II" }, 
+/* 0x0c93 -  3219 */ { "Adept's Standard of Anger III" }, 
+/* 0x0c94 -  3220 */ { "Adept's Standard of Anger IV" }, 
 /* 0x0c95 -  3221 */ { "Shattering Glass" }, 
 /* 0x0c96 -  3222 */ { "Web of Glass" }, 
 /* 0x0c97 -  3223 */ { "Shards of Glass" }, 
@@ -3242,7 +3242,7 @@
 /* 0x0c9e -  3230 */ { "Balance of the Nameless" }, 
 /* 0x0c9f -  3231 */ { "No Spell" }, 
 /* 0x0ca0 -  3232 */ { "Karana's Renewal" }, 
-/* 0x0ca1 -  3233 */ { "Tnarg`s Mending" }, 
+/* 0x0ca1 -  3233 */ { "Tnarg's Mending" }, 
 /* 0x0ca2 -  3234 */ { "Protection of the Nine" }, 
 /* 0x0ca3 -  3235 */ { "Focus of Soul" }, 
 /* 0x0ca4 -  3236 */ { "no spell" }, 
@@ -3289,7 +3289,7 @@
 /* 0x0ccd -  3277 */ { "Spirit of the Wood" }, 
 /* 0x0cce -  3278 */ { "Spirit of the Wood" }, 
 /* 0x0ccf -  3279 */ { "Spirit of the Wood" }, 
-/* 0x0cd0 -  3280 */ { "Hobble of Spirits Eff" }, 
+/* 0x0cd0 -  3280 */ { "Hobble of Spirits Effect" }, 
 /* 0x0cd1 -  3281 */ { "Servant's Bolt" }, 
 /* 0x0cd2 -  3282 */ { "Boastful Bellow" }, 
 /* 0x0cd3 -  3283 */ { "Spirit Call I" }, 
@@ -3372,17 +3372,17 @@
 /* 0x0d20 -  3360 */ { "Voice of Quellious" }, 
 /* 0x0d21 -  3361 */ { "Silent Song of Quellious" }, 
 /* 0x0d22 -  3362 */ { "Rizlona's Call of Flame" }, 
-/* 0x0d23 -  3363 */ { "Tuyen`s Chant of the Plague" }, 
+/* 0x0d23 -  3363 */ { "Tuyen's Chant of the Plague" }, 
 /* 0x0d24 -  3364 */ { "Druzzil's Disillusionment" }, 
 /* 0x0d25 -  3365 */ { "Melody of Mischief" }, 
 /* 0x0d26 -  3366 */ { "Saryrn's Scream of Pain" }, 
-/* 0x0d27 -  3367 */ { "Tuyen`s Chant of Fire" }, 
+/* 0x0d27 -  3367 */ { "Tuyen's Chant of Fire" }, 
 /* 0x0d28 -  3368 */ { "Psalm of Veeshan" }, 
 /* 0x0d29 -  3369 */ { "Dreams of Terris" }, 
-/* 0x0d2a -  3370 */ { "Tuyen`s Chant of Venom" }, 
+/* 0x0d2a -  3370 */ { "Tuyen's Chant of Venom" }, 
 /* 0x0d2b -  3371 */ { "Call of the Banshee" }, 
 /* 0x0d2c -  3372 */ { "Chorus of Marr" }, 
-/* 0x0d2d -  3373 */ { "Tuyen`s Chant of Ice" }, 
+/* 0x0d2d -  3373 */ { "Tuyen's Chant of Ice" }, 
 /* 0x0d2e -  3374 */ { "Warsong of Zek" }, 
 /* 0x0d2f -  3375 */ { "Harmony of Sound" }, 
 /* 0x0d30 -  3376 */ { "Lullaby of Morell" }, 
@@ -3451,7 +3451,7 @@
 /* 0x0d6f -  3439 */ { "Nature's Might" }, 
 /* 0x0d70 -  3440 */ { "Ro's Illumination" }, 
 /* 0x0d71 -  3441 */ { "Blessing of Replenishment" }, 
-/* 0x0d72 -  3442 */ { "E'ci's Frosty Breath" }, 
+/* 0x0d72 -  3442 */ { "E`ci's Frosty Breath" }, 
 /* 0x0d73 -  3443 */ { "Nature's Infusion" }, 
 /* 0x0d74 -  3444 */ { "Protection of Seasons" }, 
 /* 0x0d75 -  3445 */ { "Command of Tunare" }, 
@@ -3467,7 +3467,7 @@
 /* 0x0d7f -  3455 */ { "Healing of Sorsha" }, 
 /* 0x0d80 -  3456 */ { "Spiritual Vigor" }, 
 /* 0x0d81 -  3457 */ { "Spirit of Arag" }, 
-/* 0x0d82 -  3458 */ { "Arag`s Celerity" }, 
+/* 0x0d82 -  3458 */ { "Arag's Celerity" }, 
 /* 0x0d83 -  3459 */ { "Spirit of Rellic" }, 
 /* 0x0d84 -  3460 */ { "Spiritual Dominion" }, 
 /* 0x0d85 -  3461 */ { "Spirit of Sorsha" }, 
@@ -3565,18 +3565,18 @@
 /* 0x0de1 -  3553 */ { "Aura of Bravery" }, 
 /* 0x0de2 -  3554 */ { "Aura of Valor" }, 
 /* 0x0de3 -  3555 */ { "Aura of Resolution" }, 
-/* 0x0de4 =  3556 */ { NULL, },
-/* 0x0de5 =  3557 */ { NULL, },
-/* 0x0de6 =  3558 */ { NULL, },
-/* 0x0de7 =  3559 */ { NULL, },
+/* 0x0de4 -  3556 */ { "Expert's Standard of Anger I" }, 
+/* 0x0de5 -  3557 */ { "Expert's Standard of Anger II" }, 
+/* 0x0de6 -  3558 */ { "Expert's Standard of Anger III" }, 
+/* 0x0de7 -  3559 */ { "Expert's Standard of Anger IV" }, 
 /* 0x0de8 -  3560 */ { "Spear of Pain" }, 
 /* 0x0de9 -  3561 */ { "Spear of Disease" }, 
 /* 0x0dea -  3562 */ { "Spear of Plague" }, 
 /* 0x0deb -  3563 */ { "Elixir of the Simian" }, 
 /* 0x0dec -  3564 */ { "Burning Arrow" }, 
 /* 0x0ded -  3565 */ { "Flaming Arrow" }, 
-/* 0x0dee -  3566 */ { "Tuyen`s Chant of Poison" }, 
-/* 0x0def -  3567 */ { "Tuyen`s Chant of Disease" }, 
+/* 0x0dee -  3566 */ { "Tuyen's Chant of Poison" }, 
+/* 0x0def -  3567 */ { "Tuyen's Chant of Disease" }, 
 /* 0x0df0 -  3568 */ { "Ice Spear" }, 
 /* 0x0df1 -  3569 */ { "Frost Shard" }, 
 /* 0x0df2 -  3570 */ { "Ice Shard" }, 
@@ -3590,7 +3590,7 @@
 /* 0x0dfa -  3578 */ { "Brell's Steadfast Aegis" }, 
 /* 0x0dfb -  3579 */ { "Share Form of the Great Wolf" }, 
 /* 0x0dfc -  3580 */ { "Spirit of Ash" }, 
-/* 0x0dfd -  3581 */ { "O`Keils Levity" }, 
+/* 0x0dfd -  3581 */ { "O`Keil's Levity" }, 
 /* 0x0dfe -  3582 */ { "Elemental Cloak" }, 
 /* 0x0dff -  3583 */ { "Tiny Companion" }, 
 /* 0x0e00 -  3584 */ { "Refresh Summoning" }, 
@@ -3622,7 +3622,7 @@
 /* 0x0e1a -  3610 */ { "Unfold Fletching Kit" }, 
 /* 0x0e1b -  3611 */ { "Unfold Mortar and Pestle" }, 
 /* 0x0e1c -  3612 */ { "Prayer of Dar Khura" }, 
-/* 0x0e1d -  3613 */ { "MentalCorruptionRecourse" }, 
+/* 0x0e1d -  3613 */ { "Mental Corruption Recourse" }, 
 /* 0x0e1e -  3614 */ { "Entrap" }, 
 /* 0x0e1f -  3615 */ { "Twilight Passage" }, 
 /* 0x0e20 -  3616 */ { "Elixir of the Avian" }, 
@@ -3686,10 +3686,10 @@
 /* 0x0e5a -  3674 */ { "Turmoil of Charyb" }, 
 /* 0x0e5b -  3675 */ { "Vortex of Cetacea" }, 
 /* 0x0e5c -  3676 */ { "Whirlpool" }, 
-/* 0x0e5d =  3677 */ { NULL, },
-/* 0x0e5e =  3678 */ { NULL, },
-/* 0x0e5f =  3679 */ { NULL, },
-/* 0x0e60 =  3680 */ { NULL, },
+/* 0x0e5d -  3677 */ { "Initiate's Standard of Recovery I" }, 
+/* 0x0e5e -  3678 */ { "Initiate's Standard of Recovery II" }, 
+/* 0x0e5f -  3679 */ { "Initiate's Standard of Recovery III" }, 
+/* 0x0e60 -  3680 */ { "Initiate's Standard of Recovery IV" }, 
 /* 0x0e61 -  3681 */ { "Aria of Innocence" }, 
 /* 0x0e62 -  3682 */ { "Aria of Asceticism" }, 
 /* 0x0e63 -  3683 */ { "Ethereal Cleansing" }, 
@@ -3716,9 +3716,9 @@
 /* 0x0e78 -  3704 */ { "Soul Empathy" }, 
 /* 0x0e79 -  3705 */ { "Soul Empathy Recourse" }, 
 /* 0x0e7a -  3706 */ { "Frozen Harpoon" }, 
-/* 0x0e7b =  3707 */ { NULL, },
-/* 0x0e7c =  3708 */ { NULL, },
-/* 0x0e7d =  3709 */ { NULL, },
+/* 0x0e7b -  3707 */ { "Apprentice's Standard of Recovery I" }, 
+/* 0x0e7c -  3708 */ { "Apprentice's Standard of Recovery II" }, 
+/* 0x0e7d -  3709 */ { "Apprentice's Standard of Recovery III" }, 
 /* 0x0e7e -  3710 */ { "Miraculous Visions" }, 
 /* 0x0e7f -  3711 */ { "Overlord Smash" }, 
 /* 0x0e80 -  3712 */ { "Maelin's Meditation" }, 
@@ -3891,7 +3891,7 @@
 /* 0x0f27 -  3879 */ { "Aura of the Defender" }, 
 /* 0x0f28 -  3880 */ { "Aura of the Berserker" }, 
 /* 0x0f29 -  3881 */ { "Hand of Retribution" }, 
-/* 0x0f2a -  3882 */ { "HandOfRetributionRecourse" }, 
+/* 0x0f2a -  3882 */ { "Hand of Retribution Recourse" }, 
 /* 0x0f2b -  3883 */ { "Cleave I" }, 
 /* 0x0f2c -  3884 */ { "Cleave II" }, 
 /* 0x0f2d -  3885 */ { "Cleave III" }, 
@@ -3926,9 +3926,9 @@
 /* 0x0f4a -  3914 */ { "Marl" }, 
 /* 0x0f4b -  3915 */ { "Chill of Undeath" }, 
 /* 0x0f4c -  3916 */ { "Plagued Torment" }, 
-/* 0x0f4d =  3917 */ { NULL, },
-/* 0x0f4e =  3918 */ { NULL, },
-/* 0x0f4f =  3919 */ { NULL, },
+/* 0x0f4d -  3917 */ { "Apprentice's Standard of Recovery IV" }, 
+/* 0x0f4e -  3918 */ { "Neophyte's Standard of Recovery I" }, 
+/* 0x0f4f -  3919 */ { "Neophyte's Standard of Recovery II" }, 
 /* 0x0f50 -  3920 */ { "Garudon's Rage" }, 
 /* 0x0f51 -  3921 */ { "Guide Evacuation" }, 
 /* 0x0f52 -  3922 */ { "Echo of Anger" }, 
@@ -3988,7 +3988,7 @@
 /* 0x0f88 -  3976 */ { "Draught of Lightning" }, 
 /* 0x0f89 -  3977 */ { "Soul Consumption R." }, 
 /* 0x0f8a -  3978 */ { "Greenmist Recourse" }, 
-/* 0x0f8b -  3979 */ { "Effusion of E'ci" }, 
+/* 0x0f8b -  3979 */ { "Effusion of E`ci" }, 
 /* 0x0f8c -  3980 */ { "Soul Well Recourse" }, 
 /* 0x0f8d -  3981 */ { "Mass Clarify Mana" }, 
 /* 0x0f8e -  3982 */ { "Mass Crystallize Mana" }, 
@@ -4041,23 +4041,23 @@
 /* 0x0fbd -  4029 */ { "Summon Iron Bracelet" }, 
 /* 0x0fbe -  4030 */ { "Summon Steel Bracelet" }, 
 /* 0x0fbf -  4031 */ { "Spectral Gift" }, 
-/* 0x0fc0 =  4032 */ { NULL, },
-/* 0x0fc1 =  4033 */ { NULL, },
-/* 0x0fc2 =  4034 */ { NULL, },
-/* 0x0fc3 =  4035 */ { NULL, },
-/* 0x0fc4 =  4036 */ { NULL, },
-/* 0x0fc5 =  4037 */ { NULL, },
-/* 0x0fc6 =  4038 */ { NULL, },
-/* 0x0fc7 =  4039 */ { NULL, },
-/* 0x0fc8 =  4040 */ { NULL, },
-/* 0x0fc9 =  4041 */ { NULL, },
-/* 0x0fca =  4042 */ { NULL, },
-/* 0x0fcb =  4043 */ { NULL, },
-/* 0x0fcc =  4044 */ { NULL, },
-/* 0x0fcd =  4045 */ { NULL, },
-/* 0x0fce =  4046 */ { NULL, },
-/* 0x0fcf =  4047 */ { NULL, },
-/* 0x0fd0 =  4048 */ { NULL, },
+/* 0x0fc0 -  4032 */ { "Affliction Haste VI" }, 
+/* 0x0fc1 -  4033 */ { "Enhancement Haste VI" }, 
+/* 0x0fc2 -  4034 */ { "Summoning Haste VI" }, 
+/* 0x0fc3 -  4035 */ { "Affliction Efficiency VI" }, 
+/* 0x0fc4 -  4036 */ { "Summoning Efficiency VI" }, 
+/* 0x0fc5 -  4037 */ { "Strength Increase VI" }, 
+/* 0x0fc6 -  4038 */ { "Stamina Increase VI" }, 
+/* 0x0fc7 -  4039 */ { "Agility Increase VI" }, 
+/* 0x0fc8 -  4040 */ { "Dexterity Increase VI" }, 
+/* 0x0fc9 -  4041 */ { "Wisdom Increase VI" }, 
+/* 0x0fca -  4042 */ { "Intelligence Increase VI" }, 
+/* 0x0fcb -  4043 */ { "Charisma Increase VI" }, 
+/* 0x0fcc -  4044 */ { "Neophyte's Standard of Recovery III" }, 
+/* 0x0fcd -  4045 */ { "Neophyte's Standard of Recovery IV" }, 
+/* 0x0fce -  4046 */ { "Journeyman's Standard of Recovery I" }, 
+/* 0x0fcf -  4047 */ { "Journeyman's Standard of Recovery II" }, 
+/* 0x0fd0 -  4048 */ { "Journeyman's Standard of Recovery III" }, 
 /* 0x0fd1 -  4049 */ { "Circle of Cooling" }, 
 /* 0x0fd2 -  4050 */ { "Circle of Warmth" }, 
 /* 0x0fd3 -  4051 */ { "Talisman of Purity" }, 
@@ -4190,10 +4190,10 @@
 /* 0x1052 -  4178 */ { "Teleport: South Ro" }, 
 /* 0x1053 -  4179 */ { "Teleport: Butcherblock" }, 
 /* 0x1054 -  4180 */ { "Teleport: Everfrost" }, 
-/* 0x1055 =  4181 */ { NULL, },
-/* 0x1056 =  4182 */ { NULL, },
-/* 0x1057 =  4183 */ { NULL, },
-/* 0x1058 =  4184 */ { NULL, },
+/* 0x1055 -  4181 */ { "Journeyman's Standard of Recovery IV" }, 
+/* 0x1056 -  4182 */ { "Adept's Standard of Recovery I" }, 
+/* 0x1057 -  4183 */ { "Adept's Standard of Recovery II" }, 
+/* 0x1058 -  4184 */ { "Adept's Standard of Recovery III" }, 
 /* 0x1059 -  4185 */ { "Throw" }, 
 /* 0x105a -  4186 */ { "Crumbling Blow" }, 
 /* 0x105b -  4187 */ { "Shockwave of Shrapnel" }, 
@@ -4219,7 +4219,7 @@
 /* 0x106f -  4207 */ { "Burning Magic" }, 
 /* 0x1070 -  4208 */ { "Blessed Healing" }, 
 /* 0x1071 -  4209 */ { "Blessed Aura of Health" }, 
-/* 0x1072 -  4210 */ { "Fufil`s Diminishing Dirge" }, 
+/* 0x1072 -  4210 */ { "Fufil's Diminishing Dirge" }, 
 /* 0x1073 -  4211 */ { "Tricky Strike" }, 
 /* 0x1074 -  4212 */ { "Regeneration IV" }, 
 /* 0x1075 -  4213 */ { "Regeneration V" }, 
@@ -4387,7 +4387,7 @@
 /* 0x1117 -  4375 */ { "Chill" }, 
 /* 0x1118 -  4376 */ { "Icicle Strike" }, 
 /* 0x1119 -  4377 */ { "Icicle Claw" }, 
-/* 0x111a -  4378 */ { "Vox' Bite" }, 
+/* 0x111a -  4378 */ { "Vox's Bite" }, 
 /* 0x111b -  4379 */ { "Permafrost" }, 
 /* 0x111c -  4380 */ { "Mirror I" }, 
 /* 0x111d -  4381 */ { "Mirror II" }, 
@@ -4749,7 +4749,7 @@
 /* 0x1281 -  4737 */ { "Commander's Weakening Touch" }, 
 /* 0x1282 -  4738 */ { "Commander's Nefarious Touch" }, 
 /* 0x1283 -  4739 */ { "Discord's Rebuke" }, 
-/* 0x1284 -  4740 */ { "Haste of the Tunat'Muram" }, 
+/* 0x1284 -  4740 */ { "Haste of the Tunat`Muram" }, 
 /* 0x1285 -  4741 */ { "Reflection of Discord I" }, 
 /* 0x1286 -  4742 */ { "Reflection of Discord II" }, 
 /* 0x1287 -  4743 */ { "Reflection of Discord III" }, 
@@ -4759,42 +4759,42 @@
 /* 0x128b -  4747 */ { "Effusion of Bertoxxulous" }, 
 /* 0x128c -  4748 */ { "Discordant Feedback" }, 
 /* 0x128d -  4749 */ { "Cloud of Attrition" }, 
-/* 0x128e =  4750 */ { NULL, },
-/* 0x128f =  4751 */ { NULL, },
-/* 0x1290 =  4752 */ { NULL, },
-/* 0x1291 =  4753 */ { NULL, },
-/* 0x1292 =  4754 */ { NULL, },
-/* 0x1293 =  4755 */ { NULL, },
-/* 0x1294 =  4756 */ { NULL, },
-/* 0x1295 =  4757 */ { NULL, },
-/* 0x1296 =  4758 */ { NULL, },
-/* 0x1297 =  4759 */ { NULL, },
-/* 0x1298 =  4760 */ { NULL, },
-/* 0x1299 =  4761 */ { NULL, },
-/* 0x129a =  4762 */ { NULL, },
-/* 0x129b =  4763 */ { NULL, },
-/* 0x129c =  4764 */ { NULL, },
-/* 0x129d =  4765 */ { NULL, },
-/* 0x129e =  4766 */ { NULL, },
-/* 0x129f =  4767 */ { NULL, },
-/* 0x12a0 =  4768 */ { NULL, },
-/* 0x12a1 =  4769 */ { NULL, },
-/* 0x12a2 =  4770 */ { NULL, },
-/* 0x12a3 =  4771 */ { NULL, },
-/* 0x12a4 =  4772 */ { NULL, },
-/* 0x12a5 =  4773 */ { NULL, },
-/* 0x12a6 =  4774 */ { NULL, },
-/* 0x12a7 =  4775 */ { NULL, },
-/* 0x12a8 =  4776 */ { NULL, },
-/* 0x12a9 =  4777 */ { NULL, },
-/* 0x12aa =  4778 */ { NULL, },
-/* 0x12ab =  4779 */ { NULL, },
-/* 0x12ac =  4780 */ { NULL, },
-/* 0x12ad =  4781 */ { NULL, },
-/* 0x12ae =  4782 */ { NULL, },
-/* 0x12af =  4783 */ { NULL, },
-/* 0x12b0 =  4784 */ { NULL, },
-/* 0x12b1 =  4785 */ { NULL, },
+/* 0x128e -  4750 */ { "Adept's Standard of Recovery IV" }, 
+/* 0x128f -  4751 */ { "Expert's Standard of Recovery I" }, 
+/* 0x1290 -  4752 */ { "Expert's Standard of Recovery II" }, 
+/* 0x1291 -  4753 */ { "Expert's Standard of Recovery III" }, 
+/* 0x1292 -  4754 */ { "Expert's Standard of Recovery IV" }, 
+/* 0x1293 -  4755 */ { "Initiate's Standard of Conservation I" }, 
+/* 0x1294 -  4756 */ { "Initiate's Standard of Conservation II" }, 
+/* 0x1295 -  4757 */ { "Initiate's Standard of Conservation III" }, 
+/* 0x1296 -  4758 */ { "Initiate's Standard of Conservation IV" }, 
+/* 0x1297 -  4759 */ { "Apprentice's Standard of Conservation I" }, 
+/* 0x1298 -  4760 */ { "Apprentice's Standard of Conservation II" }, 
+/* 0x1299 -  4761 */ { "Apprentice's Standard of Conservation III" }, 
+/* 0x129a -  4762 */ { "Apprentice's Standard of Conservation IV" }, 
+/* 0x129b -  4763 */ { "Neophyte's Standard of Conservation I" }, 
+/* 0x129c -  4764 */ { "Neophyte's Standard of Conservation II" }, 
+/* 0x129d -  4765 */ { "Neophyte's Standard of Conservation III" }, 
+/* 0x129e -  4766 */ { "Neophyte's Standard of Conservation IV" }, 
+/* 0x129f -  4767 */ { "Journeyman's Standard of Conservation I" }, 
+/* 0x12a0 -  4768 */ { "Journeyman's Standard of Conservation II" }, 
+/* 0x12a1 -  4769 */ { "Journeyman's Standard of Conservation III" }, 
+/* 0x12a2 -  4770 */ { "Journeyman's Standard of Conservation IV" }, 
+/* 0x12a3 -  4771 */ { "Adept's Standard of Conservation I" }, 
+/* 0x12a4 -  4772 */ { "Adept's Standard of Conservation II" }, 
+/* 0x12a5 -  4773 */ { "Adept's Standard of Conservation III" }, 
+/* 0x12a6 -  4774 */ { "Adept's Standard of Conservation IV" }, 
+/* 0x12a7 -  4775 */ { "Expert's Standard of Conservation I" }, 
+/* 0x12a8 -  4776 */ { "Expert's Standard of Conservation II" }, 
+/* 0x12a9 -  4777 */ { "Expert's Standard of Conservation III" }, 
+/* 0x12aa -  4778 */ { "Expert's Standard of Conservation IV" }, 
+/* 0x12ab -  4779 */ { "Initiate's Standard of Benefit Conservation I" }, 
+/* 0x12ac -  4780 */ { "Initiate's Standard of Benefit Conservation II" }, 
+/* 0x12ad -  4781 */ { "Initiate's Standard of Benefit Conservation III" }, 
+/* 0x12ae -  4782 */ { "Initiate's Standard of Benefit Conservation IV" }, 
+/* 0x12af -  4783 */ { "Apprentice's Standard of Benefit Conservation I" }, 
+/* 0x12b0 -  4784 */ { "Apprentice's Standard of Benefit Conservation II" }, 
+/* 0x12b1 -  4785 */ { "Apprentice's Standard of Benefit Conservation III" }, 
 /* 0x12b2 -  4786 */ { "Icy Grasp" }, 
 /* 0x12b3 -  4787 */ { "Icy Grasp Effect" }, 
 /* 0x12b4 -  4788 */ { "Feral Swipe" }, 
@@ -4943,7 +4943,7 @@
 /* 0x1343 -  4931 */ { "Head Strike" }, 
 /* 0x1344 -  4932 */ { "Head Pummel" }, 
 /* 0x1345 -  4933 */ { "Head Crush" }, 
-/* 0x1346 -  4934 */ { "Diversive Strike" }, 
+/* 0x1346 -  4934 */ { "Divertive Strike" }, 
 /* 0x1347 -  4935 */ { "Distracting Strike" }, 
 /* 0x1348 -  4936 */ { "Confusing Strike" }, 
 /* 0x1349 -  4937 */ { "Corroded Axe" }, 
@@ -4957,7 +4957,7 @@
 /* 0x1351 -  4945 */ { "Cold Steel Cleaving Axe" }, 
 /* 0x1352 -  4946 */ { "Mithril Bloodaxe" }, 
 /* 0x1353 -  4947 */ { "Rage Axe" }, 
-/* 0x1354 -  4948 */ { "Bloodseekers Axe" }, 
+/* 0x1354 -  4948 */ { "Bloodseeker's Axe" }, 
 /* 0x1355 -  4949 */ { "Battlerage Axe" }, 
 /* 0x1356 -  4950 */ { "Deathfury Axe" }, 
 /* 0x1357 -  4951 */ { "Balance I" }, 
@@ -5554,8 +5554,8 @@
 /* 0x15a6 -  5542 */ { "Ferocity of Irionu" }, 
 /* 0x15a7 -  5543 */ { "Ancient: Savage Ice" }, 
 /* 0x15a8 -  5544 */ { "Static Blow" }, 
-/* 0x15a9 -  5545 */ { "Touch of the Tunat'Muram" }, 
-/* 0x15aa -  5546 */ { "Gaze of the Tunat'Muram" }, 
+/* 0x15a9 -  5545 */ { "Touch of the Tunat`Muram" }, 
+/* 0x15aa -  5546 */ { "Gaze of the Tunat`Muram" }, 
 /* 0x15ab -  5547 */ { "5322 Recourse - Res" }, 
 /* 0x15ac -  5548 */ { "Bond of Inruku Recourse" }, 
 /* 0x15ad -  5549 */ { "Inruku's Bite Recourse" }, 
@@ -5564,7 +5564,7 @@
 /* 0x15b0 -  5552 */ { "Bite of Muram Recourse" }, 
 /* 0x15b1 -  5553 */ { "Fang of Death Recourse" }, 
 /* 0x15b2 -  5554 */ { "Cloud of Discord" }, 
-/* 0x15b3 -  5555 */ { "Bellow of Tunat'Muram" }, 
+/* 0x15b3 -  5555 */ { "Bellow of Tunat`Muram" }, 
 /* 0x15b4 -  5556 */ { "Whirling Smash" }, 
 /* 0x15b5 -  5557 */ { "Elder Razul Bite" }, 
 /* 0x15b6 -  5558 */ { "Bazu Stomp" }, 
@@ -5682,7 +5682,7 @@
 /* 0x1626 -  5670 */ { "Charisma Increase II" }, 
 /* 0x1627 -  5671 */ { "Charisma Increase III" }, 
 /* 0x1628 -  5672 */ { "Charisma Increase IV" }, 
-/* 0x1629 -  5673 */ { "Charisma Increase IV" }, 
+/* 0x1629 -  5673 */ { "Charisma Increase V" }, 
 /* 0x162a -  5674 */ { "Blessing of Jelvan" }, 
 /* 0x162b -  5675 */ { "Relinquish Spirit" }, 
 /* 0x162c -  5676 */ { "Torment of Body" }, 
@@ -5773,12 +5773,12 @@
 /* 0x1681 -  5761 */ { "Heart of Frost" }, 
 /* 0x1682 -  5762 */ { "Lava Breath" }, 
 /* 0x1683 -  5763 */ { "Superior Healing SP" }, 
-/* 0x1684 =  5764 */ { NULL, },
-/* 0x1685 =  5765 */ { NULL, },
-/* 0x1686 =  5766 */ { NULL, },
-/* 0x1687 =  5767 */ { NULL, },
-/* 0x1688 =  5768 */ { NULL, },
-/* 0x1689 =  5769 */ { NULL, },
+/* 0x1684 -  5764 */ { "Apprentice's Standard of Benefit Conservation IV" }, 
+/* 0x1685 -  5765 */ { "Neophyte's Standard of Benefit Conservation I" }, 
+/* 0x1686 -  5766 */ { "Neophyte's Standard of Benefit Conservation II" }, 
+/* 0x1687 -  5767 */ { "Neophyte's Standard of Benefit Conservation III" }, 
+/* 0x1688 -  5768 */ { "Neophyte's Standard of Benefit Conservation IV" }, 
+/* 0x1689 -  5769 */ { "Journeyman's Standard of Benefit Conservation I" }, 
 /* 0x168a -  5770 */ { "Beta Extended 15" }, 
 /* 0x168b -  5771 */ { "Beta Extended 20" }, 
 /* 0x168c -  5772 */ { "Beta Extended 25" }, 
@@ -5842,10 +5842,10 @@
 /* 0x16c6 -  5830 */ { "Dance of Blades" }, 
 /* 0x16c7 -  5831 */ { "Dance of Blades" }, 
 /* 0x16c8 -  5832 */ { "Dance of Blades" }, 
-/* 0x16c9 =  5833 */ { NULL, },
-/* 0x16ca =  5834 */ { NULL, },
-/* 0x16cb =  5835 */ { NULL, },
-/* 0x16cc =  5836 */ { NULL, },
+/* 0x16c9 -  5833 */ { "Journeyman's Standard of Benefit Conservation II" }, 
+/* 0x16ca -  5834 */ { "Journeyman's Standard of Benefit Conservation III" }, 
+/* 0x16cb -  5835 */ { "Journeyman's Standard of Benefit Conservation IV" }, 
+/* 0x16cc -  5836 */ { "Adept's Standard of Benefit Conservation I" }, 
 /* 0x16cd -  5837 */ { "Shield of Notes" }, 
 /* 0x16ce -  5838 */ { "Shield of Notes" }, 
 /* 0x16cf -  5839 */ { "Shield of Notes" }, 
@@ -5893,22 +5893,22 @@
 /* 0x16f9 -  5881 */ { "Spirit of the Grove" }, 
 /* 0x16fa -  5882 */ { "Spirit of the Grove" }, 
 /* 0x16fb -  5883 */ { "Spirit of the Grove" }, 
-/* 0x16fc =  5884 */ { NULL, },
-/* 0x16fd =  5885 */ { NULL, },
-/* 0x16fe =  5886 */ { NULL, },
+/* 0x16fc -  5884 */ { "Adept's Standard of Benefit Conservation II" }, 
+/* 0x16fd -  5885 */ { "Adept's Standard of Benefit Conservation III" }, 
+/* 0x16fe -  5886 */ { "Adept's Standard of Benefit Conservation IV" }, 
 /* 0x16ff -  5887 */ { "Stasis" }, 
 /* 0x1700 -  5888 */ { "Stasis" }, 
 /* 0x1701 -  5889 */ { "Stasis" }, 
-/* 0x1702 =  5890 */ { NULL, },
-/* 0x1703 =  5891 */ { NULL, },
-/* 0x1704 =  5892 */ { NULL, },
-/* 0x1705 =  5893 */ { NULL, },
-/* 0x1706 =  5894 */ { NULL, },
-/* 0x1707 =  5895 */ { NULL, },
-/* 0x1708 =  5896 */ { NULL, },
-/* 0x1709 =  5897 */ { NULL, },
-/* 0x170a =  5898 */ { NULL, },
-/* 0x170b =  5899 */ { NULL, },
+/* 0x1702 -  5890 */ { "Expert's Standard of Benefit Conservation I" }, 
+/* 0x1703 -  5891 */ { "Expert's Standard of Benefit Conservation II" }, 
+/* 0x1704 -  5892 */ { "Expert's Standard of Benefit Conservation III" }, 
+/* 0x1705 -  5893 */ { "Expert's Standard of Benefit Conservation IV" }, 
+/* 0x1706 -  5894 */ { "Initiate's Standard of Alacrity I" }, 
+/* 0x1707 -  5895 */ { "Initiate's Standard of Alacrity II" }, 
+/* 0x1708 -  5896 */ { "Initiate's Standard of Alacrity III" }, 
+/* 0x1709 -  5897 */ { "Initiate's Standard of Alacrity IV" }, 
+/* 0x170a -  5898 */ { "Apprentice's Standard of Alacrity I" }, 
+/* 0x170b -  5899 */ { "Apprentice's Standard of Alacrity II" }, 
 /* 0x170c -  5900 */ { "Rune of Discord" }, 
 /* 0x170d -  5901 */ { "Rune of Discord" }, 
 /* 0x170e -  5902 */ { "Rune of Discord" }, 
@@ -5949,9 +5949,9 @@
 /* 0x1731 -  5937 */ { "Resolute Defiance" }, 
 /* 0x1732 -  5938 */ { "Resolute Defiance" }, 
 /* 0x1733 -  5939 */ { "Press The Attack" }, 
-/* 0x1734 =  5940 */ { NULL, },
-/* 0x1735 =  5941 */ { NULL, },
-/* 0x1736 =  5942 */ { NULL, },
+/* 0x1734 -  5940 */ { "Apprentice's Standard of Alacrity III" }, 
+/* 0x1735 -  5941 */ { "Apprentice's Standard of Alacrity IV" }, 
+/* 0x1736 -  5942 */ { "Neophyte's Standard of Alacrity I" }, 
 /* 0x1737 -  5943 */ { "Mind Crash" }, 
 /* 0x1738 -  5944 */ { "Mind Crash" }, 
 /* 0x1739 -  5945 */ { "Mind Crash" }, 
@@ -5960,30 +5960,30 @@
 /* 0x173c -  5948 */ { "Prolonged Destruction" }, 
 /* 0x173d -  5949 */ { "Devoted Familiar" }, 
 /* 0x173e -  5950 */ { "Ro's Greater Familiar" }, 
-/* 0x173f -  5951 */ { "E'ci's Greater Familiar" }, 
+/* 0x173f -  5951 */ { "E`ci's Greater Familiar" }, 
 /* 0x1740 -  5952 */ { "Druzzil's Greater Familiar" }, 
 /* 0x1741 -  5953 */ { "Teleport Bind" }, 
-/* 0x1742 =  5954 */ { NULL, },
-/* 0x1743 =  5955 */ { NULL, },
-/* 0x1744 =  5956 */ { NULL, },
-/* 0x1745 =  5957 */ { NULL, },
-/* 0x...
 
[truncated message content]

[Seq-cvs-commit] SF.net SVN: seq: [670] showeq/trunk/conf/zoneopcodes.xml

From: <do...@us...> - 2007-02-14 13:34:20

Revision: 670
          http://seq.svn.sourceforge.net/seq/?rev=670&view=rev
Author:   dohpaz
Date:     2007-02-14 05:34:13 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Update some more opcodes.

Modified Paths:
--------------
    showeq/trunk/conf/zoneopcodes.xml

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-14 06:26:45 UTC (rev 669)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-14 13:34:13 UTC (rev 670)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE seqopcodes SYSTEM "seqopcodes.dtd">
 <seqopcodes>
-    <opcode id="147e" name="OP_SendAATable" updated="06/13/06">
+    <opcode id="3f32" name="OP_SendAATable" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="5471" name="OP_SendAAStats" updated="06/13/06">
+    <opcode id="1be9" name="OP_SendAAStats" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="4057" name="OP_PlayerProfile" updated="06/13/06">
+    <opcode id="4057" name="OP_PlayerProfile" updated="02/13/07">
         <comment>old CharProfileCode</comment>
         <payload dir="server" typename="charProfileStruct" sizechecktype="match"/>
     </opcode>
@@ -16,21 +16,21 @@
         <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
         <payload dir="server" typename="ServerZoneEntryStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="740b" name="OP_AckPacket" updated="06/13/06">
+    <opcode id="740b" name="OP_AckPacket" updated="02/13/07">
         <comment>Appears to be generic ack at the presentation level</comment>
     </opcode>
     <opcode id="0e13" name="OP_ZoneSpawns" updated="02/13/07">
         <comment>old ZoneSpawnsCode</comment>
         <payload dir="server" typename="spawnStruct" sizechecktype="modulus"/>
     </opcode>
-    <opcode id="08cf" name="OP_TimeOfDay" updated="06/13/06">
+    <opcode id="08cf" name="OP_TimeOfDay" updated="02/13/07">
         <comment>old TimeOfDayCode</comment>
         <payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="6ea7" name="OP_TributeUpdate" updated="06/13/06">
+    <opcode id="0e45" name="OP_TributeUpdate" updated="02/13/07">
         <comment>Tribute information</comment>
     </opcode>
-    <opcode id="4e7d" name="OP_ItemPlayerPacket" updated="10/22/06">
+    <opcode id="4d26" name="OP_ItemPlayerPacket" updated="02/13/07">
         <comment>Inventory/bank items coming over during zone</comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
@@ -40,20 +40,20 @@
     <opcode id="3f0b" name="OP_TaskActivity" updated="06/13/06">
         <comment>Task activity descriptions coming down for task window</comment>
     </opcode>
-    <opcode id="4b90" name="OP_CompletedTasks" updated="06/13/06">
+    <opcode id="5226" name="OP_CompletedTasks" updated="02/13/07">
         <comment>Task history for task window</comment>
     </opcode>
-    <opcode id="3d4b" name="OP_Weather" updated="06/13/06">
+    <opcode id="09ea" name="OP_Weather" updated="02/13/07">
         <comment>old WeatherCode</comment>
     </opcode>
-    <opcode id="2ece" name="OP_ReqNewZone" updated="06/13/06">
+    <opcode id="02f4" name="OP_ReqNewZone" updated="02/13/07">
         <comment>Client requesting NewZone_Struct</comment>
     </opcode>
-    <opcode id="4a1a" name="OP_NewZone" updated="06/13/06">
+    <opcode id="5d3e" name="OP_NewZone" updated="02/13/07">
         <comment>old NewZoneCode</comment>
         <payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="36fc" name="OP_CustomTitles" updated="06/13/06">
+    <opcode id="3665" name="OP_CustomTitles" updated="02/13/07">
         <comment>List of available titles</comment>
     </opcode>
     <opcode id="7528" name="OP_ReqClientSpawn" updated="06/13/06">
@@ -63,42 +63,42 @@
         <comment>old DoorSpawnsCode</comment>
         <payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
     </opcode>
-    <opcode id="76f0" name="OP_GroundSpawn" updated="06/13/06">
+    <opcode id="2f4b" name="OP_GroundSpawn" updated="02/13/07">
         <comment>old MakeDropCode</comment>
         <payload dir="server" typename="makeDropStruct" sizechecktype="match"/>
         <payload dir="client" typename="uint8_t" sizechecktype="none"/>
     </opcode>
-    <opcode id="3d4f" name="OP_SendZonePoints" updated="06/13/06">
+    <opcode id="4654" name="OP_SendZonePoints" updated="02/13/07">
         <comment>Coords in a zone that will port you to another zone</comment>
         <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
     </opcode>
     <opcode id="5051" name="OP_SendExpZonein" updated="06/13/06">
         <comment>Both directions. Negotiating sending of exp info.</comment>
     </opcode>
-    <opcode id="78df" name="OP_AAExpUpdate" updated="06/13/06">
+    <opcode id="499e" name="OP_AAExpUpdate" updated="02/13/07">
       <comment>Receiving AA experience. Also when percent to AA changes.</comment>
       <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="1442" name="OP_ExpUpdate" updated="06/13/06">
+    <opcode id="4e0a" name="OP_ExpUpdate" updated="02/13/07">
         <comment>old ExpUpdateCode</comment>
         <payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="077b" name="OP_AAAction" updated="06/13/06">
+    <opcode id="5f4f" name="OP_AAAction" updated="02/13/07">
         <comment>Used for changing percent, buying? and activating skills</comment>
     </opcode>
-    <opcode id="40b6" name="OP_SetServerFilter" updated="06/13/06">
+    <opcode id="1c3c" name="OP_SetServerFilter" updated="02/13/07">
         <comment>Client telling server /filter information</comment>
     </opcode>
-    <opcode id="443f" name="OP_ClientReady" updated="06/13/06">
+    <opcode id="5e9c" name="OP_ClientReady" updated="02/13/07">
         <comment></comment>
     </opcode>
     <opcode id="3afb" name="OP_TGB" updated="06/13/06">
         <comment>Client telling server to set targetgroupbuff</comment>
     </opcode>
-    <opcode id="76ba" name="OP_RaidJoin" updated="06/13/06">
+    <opcode id="2fd1" name="OP_RaidJoin" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="0cef" name="OP_GuildMemberList" updated="06/13/06">
+    <opcode id="0cef" name="OP_GuildMemberList" updated="02/13/07">
         <comment></comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
@@ -106,10 +106,10 @@
         <comment>GuildMOTD</comment>
         <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="569e" name="OP_GuildExtendedInfo" updated="06/13/06">
+    <opcode id="3891" name="OP_GuildExtendedInfo" updated="02/13/07">
         <comment>Extra guild info (i.e. chat channel, url)</comment>
     </opcode>
-    <opcode id="07e5" name="OP_GuildTributeStatus" updated="06/13/06">
+    <opcode id="7049" name="OP_GuildTributeStatus" updated="02/13/07">
         <comment>Guild tribute stats send on zone</comment>
     </opcode>
     <opcode id="28c1" name="OP_GuildTributeInfo" updated="06/13/06">
@@ -117,16 +117,16 @@
     </opcode>
 
 
-    <opcode id="178a" name="OP_ClientUpdate" updated="06/13/06">
+    <opcode id="178a" name="OP_ClientUpdate" updated="02/13/07">
         <comment>Position updates</comment>
         <payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
         <payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="5f33" name="OP_NpcMoveUpdate" updated="08/13/06">
+    <opcode id="578a" name="OP_NpcMoveUpdate" updated="02/13/07">
         <comment>Position updates</comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
-    <opcode id="1399" name="OP_MobUpdate" updated="09/23/06">
+    <opcode id="1399" name="OP_MobUpdate" updated="02/13/07">
         <comment>old MobUpdateCode</comment>
         <payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
     </opcode>
@@ -138,7 +138,7 @@
         <comment>old DeleteSpawnCode</comment>
         <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="7941" name="OP_Death" updated="06/13/06">
+    <opcode id="1399" name="OP_Death" updated="02/13/07">
         <comment>old NewCorpseCode</comment>
         <payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
     </opcode>
@@ -149,22 +149,22 @@
       <comment>Server telling client that it is coming back from hover death</comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
-    <opcode id="4195" name="OP_WearChange" updated="06/13/06">
+    <opcode id="1c8d" name="OP_WearChange" updated="02/13/07">
         <comment>old SpawnUpdateCode</comment>
         <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
     </opcode>
     <opcode id="4341" name="OP_Animation" updated="06/13/06">
         <comment></comment>
     </opcode>
-    <opcode id="1d4c" name="OP_SpawnAppearance" updated="06/13/06">
+    <opcode id="0973" name="OP_SpawnAppearance" updated="02/13/07">
         <comment>old SpawnAppearanceCode</comment>
         <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="3bb3" name="OP_Stamina" updated="06/13/05">
+    <opcode id="2cec" name="OP_Stamina" updated="02/13/07">
         <comment>Server updating on hunger/thirst</comment>
         <payload dir="server" typename="staminaStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="2660" name="OP_HPUpdate" updated="06/13/06">
+    <opcode id="1128" name="OP_HPUpdate" updated="02/13/07">
         <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment>
         <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
     </opcode>
@@ -177,7 +177,7 @@
     <opcode id="7b0f" name="OP_DeltaCheck" updated="06/13/06">
         <comment>Client sending server delta information.</comment>
     </opcode>
-    <opcode id="11e0" name="OP_GuildMemberUpdate" updated="06/13/06">
+    <opcode id="1f4b" name="OP_GuildMemberUpdate" updated="02/13/07">
         <comment></comment>
         <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
     </opcode>
@@ -215,11 +215,11 @@
         <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
     </opcode>
 
-    <opcode id="7d52" name="OP_RequestZoneChange" updated="06/13/06">
+    <opcode id="3c27" name="OP_RequestZoneChange" updated="02/13/07">
         <comment>Send by server when a click causes zone. Also, origin</comment>
         <payload dir="server" typename="requestZoneChangeStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="3d48" name="OP_ZoneChange" updated="06/13/06">
+    <opcode id="273a" name="OP_ZoneChange" updated="02/13/07">
         <comment>old ZoneChangeCode</comment>
         <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
     </opcode>
@@ -438,7 +438,7 @@
         <comment>old CloseVendorCode</comment>
         <payload dir="both" typename="unknown" sizechecktype="none"/>
     </opcode>
-    <opcode id="36e2" name="OP_MoveDoor" updated="06/13/06">
+    <opcode id="0491" name="OP_MoveDoor" updated="02/13/07">
         <comment>old DoorClickCode</comment>
     </opcode>
     <opcode id="5666" name="OP_SenseTraps" updated="10/27/05">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [669] showeq/trunk/conf/zoneopcodes.xml

From: <do...@us...> - 2007-02-14 06:26:54

Revision: 669
          http://seq.svn.sourceforge.net/seq/?rev=669&view=rev
Author:   dohpaz
Date:     2007-02-13 22:26:45 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Update a few more opcodes.

Modified Paths:
--------------
    showeq/trunk/conf/zoneopcodes.xml

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-14 05:44:03 UTC (rev 668)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-14 06:26:45 UTC (rev 669)
@@ -59,7 +59,7 @@
     <opcode id="7528" name="OP_ReqClientSpawn" updated="06/13/06">
         <comment>Client requesting spawn data</comment>
     </opcode>
-    <opcode id="0fa2" name="OP_SpawnDoor" updated="06/13/06">
+    <opcode id="6f73" name="OP_SpawnDoor" updated="02/13/07">
         <comment>old DoorSpawnsCode</comment>
         <payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
     </opcode>
@@ -185,16 +185,16 @@
         <comment>old RemDropCode</comment>
         <payload dir="both" typename="remDropStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="1684" name="OP_Action" updated="06/13/06">
+    <opcode id="72d2" name="OP_Action" updated="02/13/07">
         <comment></comment>
         <payload dir="both" typename="actionStruct" sizechecktype="match"/>
         <payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="4ed2" name="OP_Action2" updated="06/13/06">
+    <opcode id="67b4" name="OP_Action2" updated="02/13/07">
         <comment>old ActionCode</comment>
         <payload dir="both" typename="action2Struct" sizechecktype="match"/>
     </opcode>
-    <opcode id="09ea" name="OP_Consider" updated="06/13/06">
+    <opcode id="02f8" name="OP_Consider" updated="02/13/07">
         <comment>old ConsiderCode</comment>
         <payload dir="both" typename="considerStruct" sizechecktype="match"/>
     </opcode>
@@ -538,7 +538,7 @@
     <opcode id="0375" name="OP_Report" updated="06/29/05">
         <comment></comment>
     </opcode>
-    <opcode id="7136" name="OP_TargetCommand" updated="06/13/06">
+    <opcode id="3d8e" name="OP_TargetCommand" updated="02/13/07">
         <comment>Target user</comment>
     </opcode>
     <opcode id="212d" name="OP_LFPGetMatchesResponse" updated="06/13/06">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [668] showeq/trunk

From: <do...@us...> - 2007-02-14 05:44:36

Revision: 668
          http://seq.svn.sourceforge.net/seq/?rev=668&view=rev
Author:   dohpaz
Date:     2007-02-13 21:44:03 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Update spellBuff, playerProfileStruct, and charProfileStruct and a number of opcodes to make more compatible with 02/13/07 patch.

Modified Paths:
--------------
    showeq/trunk/conf/zoneopcodes.xml
    showeq/trunk/src/everquest.h
    showeq/trunk/src/xmlpreferences.cpp

Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml	2007-02-03 20:32:28 UTC (rev 667)
+++ showeq/trunk/conf/zoneopcodes.xml	2007-02-14 05:44:03 UTC (rev 668)
@@ -11,7 +11,7 @@
         <comment>old CharProfileCode</comment>
         <payload dir="server" typename="charProfileStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="7772" name="OP_ZoneEntry" updated="06/13/06">
+    <opcode id="61d6" name="OP_ZoneEntry" updated="02/13/07">
         <comment>old ZoneEntryCode</comment>
         <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
         <payload dir="server" typename="ServerZoneEntryStruct" sizechecktype="match"/>
@@ -19,7 +19,7 @@
     <opcode id="740b" name="OP_AckPacket" updated="06/13/06">
         <comment>Appears to be generic ack at the presentation level</comment>
     </opcode>
-    <opcode id="35c0" name="OP_ZoneSpawns" updated="06/13/06">
+    <opcode id="0e13" name="OP_ZoneSpawns" updated="02/13/07">
         <comment>old ZoneSpawnsCode</comment>
         <payload dir="server" typename="spawnStruct" sizechecktype="modulus"/>
     </opcode>
@@ -102,7 +102,7 @@
         <comment></comment>
         <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
-    <opcode id="5026" name="OP_GuildMOTD" updated="06/13/06">
+    <opcode id="66a4" name="OP_GuildMOTD" updated="02/13/07">
         <comment>GuildMOTD</comment>
         <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
     </opcode>
@@ -130,11 +130,11 @@
         <comment>old MobUpdateCode</comment>
         <payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
     </opcode>
-    <opcode id="6f3b" name="OP_NewSpawn" updated="06/13/06">
+    <opcode id="2bf1" name="OP_NewSpawn" updated="02/13/07">
         <comment>old NewSpawnCode</comment>
         <payload dir="server" typename="spawnStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="40d0" name="OP_DeleteSpawn" updated="06/13/06">
+    <opcode id="79a0" name="OP_DeleteSpawn" updated="02/13/07">
         <comment>old DeleteSpawnCode</comment>
         <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
     </opcode>
@@ -272,11 +272,11 @@
     <opcode id="4fc7" name="OP_LoadSpellSet" updated="06/13/05">
         <comment>/mem spellsetname</comment>
     </opcode>
-    <opcode id="181e" name="OP_SwapSpell" updated="06/13/06">
+    <opcode id="518a" name="OP_SwapSpell" updated="02/13/07">
         <comment>old TradeSpellBookSlotsCode</comment>
         <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="5f68" name="OP_MemorizeSpell" updated="06/13/06">
+    <opcode id="509f" name="OP_MemorizeSpell" updated="02/13/07">
         <comment>old MemSpellCode</comment>
         <payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
     </opcode>
@@ -289,7 +289,7 @@
         <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
     </opcode>
 
-    <opcode id="5644" name="OP_Emote" updated="06/13/06">
+    <opcode id="40d0" name="OP_Emote" updated="02/13/07">
         <comment>old EmoteTextCode</comment>
         <payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
     </opcode>
@@ -297,11 +297,11 @@
         <comment>old SimpleMessageCode</comment>
         <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="771d" name="OP_FormattedMessage" updated="06/13/06">
+    <opcode id="1dab" name="OP_FormattedMessage" updated="02/13/07">
         <comment>old FormattedMessageCode</comment>
         <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="0b5a" name="OP_CommonMessage" updated="06/13/06">
+    <opcode id="0b5a" name="OP_CommonMessage" updated="02/13/07">
         <comment>old ChannelMessageCode</comment>
         <payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
     </opcode>
@@ -309,11 +309,11 @@
         <comment>Communicate textual info to client</comment>
         <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="3249" name="OP_RandomReq" updated="06/13/06">
+    <opcode id="7c7c" name="OP_RandomReq" updated="02/13/07">
         <comment>old RandomReqCode</comment>
         <payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
     </opcode>
-    <opcode id="5e9c" name="OP_RandomReply" updated="06/13/06">
+    <opcode id="3c48" name="OP_RandomReply" updated="02/13/07">
         <comment>old RandomCode</comment>
         <payload dir="server" typename="randomStruct" sizechecktype="match"/>
     </opcode>
@@ -357,19 +357,19 @@
         <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
     </opcode>
 
-    <opcode id="28c1" name="OP_ItemPacket" updated="06/13/06">
+    <opcode id="6bd7" name="OP_ItemPacket" updated="02/13/07">
         <comment>old ItemCode</comment>
         <payload dir="server" typename="itemPacketStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="63f9" name="OP_ItemLinkClick" updated="06/13/06">
+    <opcode id="63f9" name="OP_ItemLinkClick" updated="02/13/07">
         <comment></comment>
     </opcode>
-    <opcode id="4e56" name="OP_ItemLinkResponse" updated="06/13/05">
+    <opcode id="5dc5" name="OP_ItemLinkResponse" updated="02/13/07">
         <comment>old ItemInfoCode</comment>
         <payload dir="server" typename="itemInfoStruct" sizechecktype="none"/>
         <payload dir="client" typename="itemInfoReqStruct" sizechecktype="none"/>
     </opcode>
-    <opcode id="60f2" name="OP_ManaChange" updated="06/13/06">
+    <opcode id="60f2" name="OP_ManaChange" updated="02/13/07">
         <comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
         <payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
         <payload dir="client" typename="uint8_t" sizechecktype="none"/>
@@ -413,10 +413,10 @@
     <opcode id="5c06" name="OP_Save" updated="04/19/06">
         <comment>Client asking server to save user state</comment>
     </opcode>
-    <opcode id="2265" name="OP_Camp" updated="06/13/05">
+    <opcode id="2eeb" name="OP_Camp" updated="02/13/07">
         <comment>old cStartCampingCode</comment>
     </opcode>
-    <opcode id="0e13" name="OP_ShopPlayerSell" updated="10/27/05">
+    <opcode id="fe13" name="OP_ShopPlayerSell" updated="10/27/05">
         <comment>old SellItemCode</comment>
     </opcode>
     <opcode id="7a46" name="OP_AutoAttack" updated="06/13/06">

Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h	2007-02-03 20:32:28 UTC (rev 667)
+++ showeq/trunk/src/everquest.h	2007-02-14 05:44:03 UTC (rev 668)
@@ -439,8 +439,7 @@
 /*0008*/  int32_t     duration;       // Time remaining in ticks
 /*0012*/  int32_t     effect;         // holds the dmg absorb amount on runes
 /*0016*/  uint32_t    playerId;       // Global id of caster (for wear off)
-/*0020*/  uint8_t     unknown0020[12];
-/*0032*/
+/*0020*/  
 };
 
 
@@ -664,17 +663,17 @@
 /*06284*/ uint32_t  thirst;             // Drink (ticks till next drink)
 /*06288*/ uint32_t  hunger;             // Food (ticks till next eat)
 /*06292*/ spellBuff buffs[MAX_BUFFS];   // Buffs currently on the player
-/*07092*/ uint32_t  disciplines[MAX_DISCIPLINES]; // Known disciplines
-/*07492*/ uint8_t unknown07492[160];
-/*07652*/ uint32_t recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use)
-/*07732*/ uint32_t  endurance;          // Current endurance
-/*07736*/ uint32_t  aa_spent;           // Number of spent AA points
-/*07740*/ uint32_t  aa_unspent;         // Unspent AA points
-/*07744*/ uint8_t unknown07744[4];
-/*07748*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents
-/*14148*/ InlineItem potionBelt[MAX_POTIONS_IN_BELT]; // potion belt
-/*14436*/ uint8_t unknown14436[92];
-/*14528*/
+/*06792*/ uint32_t  disciplines[MAX_DISCIPLINES]; // Known disciplines
+/*07192*/ uint8_t unknown07492[160];
+/*07352*/ uint32_t recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use)
+/*07432*/ uint32_t  endurance;          // Current endurance
+/*07436*/ uint32_t  aa_spent;           // Number of spent AA points
+/*07440*/ uint32_t  aa_unspent;         // Unspent AA points
+/*07444*/ uint8_t unknown07744[4];
+/*07448*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents
+/*13848*/ InlineItem potionBelt[MAX_POTIONS_IN_BELT]; // potion belt
+/*14136*/ uint8_t unknown14436[92];
+/*14228*/
 };
 
 /*
@@ -686,81 +685,81 @@
 {
 /*00000*/ uint32_t  checksum;           //
 /*00004*/ playerProfileStruct profile;  // Profile
-/*14528*/ char      name[64];           // Name of player
-/*14592*/ char      lastName[32];       // Last name of player
-/*14624*/ uint8_t   unknown14624[12];    //***Placeholder (1/18/2006)
-/*14636*/ int32_t   guildID;            // guildID
-/*14640*/ uint32_t  birthdayTime;       // character birthday
-/*14644*/ uint32_t  lastSaveTime;       // character last save time
-/*14648*/ uint32_t  timePlayedMin;      // time character played
-/*14652*/ uint8_t   pvp;                // 1=pvp, 0=not pvp
-/*14653*/ uint8_t   anon;               // 2=roleplay, 1=anon, 0=not anon     
-/*14654*/ uint8_t   gm;                 // 0=no, 1=yes (guessing!)
-/*14655*/ int8_t    guildstatus;        // 0=member, 1=officer, 2=guildleader
-/*14656*/ uint8_t unknown14656[12];
-/*14668*/ uint32_t  exp;                // Current Experience
-/*14672*/ uint8_t unknown14672[12];
-/*14684*/ uint8_t   languages[MAX_KNOWN_LANGS]; // List of languages
-/*14709*/ uint8_t   unknown14709[7];    // All 0x00 (language buffer?)
-/*14716*/ float     y;                  // Players y position
-/*14720*/ float     x;                  // Players x position
-/*14724*/ float     z;                  // Players z position
-/*14728*/ float     heading;            // Players heading   
-/*14732*/ uint8_t   unknown14732[4];    // ***Placeholder
-/*14736*/ uint32_t  platinum_bank;      // Platinum Pieces in Bank
-/*14740*/ uint32_t  gold_bank;          // Gold Pieces in Bank
-/*14744*/ uint32_t  silver_bank;        // Silver Pieces in Bank
-/*14748*/ uint32_t  copper_bank;        // Copper Pieces in Bank
-/*14752*/ uint32_t  platinum_shared;    // Shared platinum pieces
-/*14756*/ uint8_t unknown14756[84];
-/*14840*/ uint32_t  expansions;         // Bitmask for expansions
-/*14844*/ uint8_t unknown14844[12];
-/*14856*/ uint32_t  autosplit;          // 0 = off, 1 = on
-/*14860*/ uint8_t unknown14860[16];
-/*14876*/ uint16_t  zoneId;             // see zones.h
-/*14878*/ uint16_t  zoneInstance;       // Instance id
-/*14880*/ char      groupMembers[MAX_GROUP_MEMBERS][64];// all the members in group, including self 
-/*15264*/ char      groupLeader[64];    // Leader of the group ?
-/*15328*/ uint8_t unknown15328[660];
-/*15988*/ uint32_t  leadAAActive;       // 0 = leader AA off, 1 = leader AA on
-/*15992*/ uint8_t unknown15992[136];
-/*16128*/ uint32_t  ldon_guk_points;    // Earned GUK points
-/*16132*/ uint32_t  ldon_mir_points;    // Earned MIR points
-/*16136*/ uint32_t  ldon_mmc_points;    // Earned MMC points
-/*16140*/ uint32_t  ldon_ruj_points;    // Earned RUJ points
-/*16144*/ uint32_t  ldon_tak_points;    // Earned TAK points
-/*16148*/ uint32_t  ldon_avail_points;  // Available LDON points
-/*16152*/ uint8_t unknown16152[136];
-/*16288*/ uint32_t  tributeTime;        // Time remaining on tribute (millisecs)
-/*16292*/ uint32_t  careerTribute;      // Total favor points for this char
-/*16296*/ uint32_t  unknown16296;       // *** Placeholder
-/*16300*/ uint32_t  currentTribute;     // Current tribute points
-/*16304*/ uint32_t  unknown16304;       // *** Placeholder
-/*16308*/ uint32_t  tributeActive;      // 0 = off, 1=on
-/*16312*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout
-/*16352*/ uint8_t unknown16352[8];
-/*16360*/ uint32_t  expGroupLeadAA;     // Current group lead exp points (format though??)
-/*16364*/ uint32_t unknown16364;
-/*16368*/ uint32_t  expRaidLeadAA;      // Current raid lead AA exp points (format though??)
-/*16372*/ uint32_t  groupLeadAAUnspent; // Unspent group lead AA points
-/*16376*/ uint32_t  raidLeadAAUnspent;  // Unspent raid lead AA points
-/*16380*/ uint32_t  leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks
-/*16508*/ uint8_t unknown16508[128];
-/*16636*/ uint32_t  airRemaining;       // Air supply (seconds)
-/*16640*/ uint8_t unknown16640[4608];
-/*21248*/ uint32_t expAA;               // Exp earned in current AA point
-/*21252*/ uint8_t unknown21252[40];
-/*21292*/ uint32_t currentRadCrystals;  // Current count of radiant crystals
-/*21296*/ uint32_t careerRadCrystals;   // Total count of radiant crystals ever
-/*21300*/ uint32_t currentEbonCrystals; // Current count of ebon crystals
-/*21304*/ uint32_t careerEbonCrystals;  // Total count of ebon crystals ever
-/*21308*/ uint8_t  groupAutoconsent;    // 0=off, 1=on
-/*21309*/ uint8_t  raidAutoconsent;     // 0=off, 1=on
-/*21310*/ uint8_t  guildAutoconsent;    // 0=off, 1=on
-/*21311*/ uint8_t  unknown21311[5];     // ***Placeholder (6/29/2005)
-/*21316*/ uint32_t showhelm;            // 0=no, 1=yes
-/*21320*/ uint8_t  unknown21320[8];     // ***Placeholder (10/27/2005)
-/*21328*/
+/*14228*/ char      name[64];           // Name of player
+/*14292*/ char      lastName[32];       // Last name of player
+/*14324*/ uint8_t   unknown14324[8];    //***Placeholder (1/18/2006)
+/*14332*/ int32_t   guildID;            // guildID
+/*14336*/ uint32_t  birthdayTime;       // character birthday
+/*14340*/ uint32_t  lastSaveTime;       // character last save time
+/*14344*/ uint32_t  timePlayedMin;      // time character played
+/*14348*/ uint8_t   pvp;                // 1=pvp, 0=not pvp
+/*14349*/ uint8_t   anon;               // 2=roleplay, 1=anon, 0=not anon     
+/*14350*/ uint8_t   gm;                 // 0=no, 1=yes (guessing!)
+/*14351*/ int8_t    guildstatus;        // 0=member, 1=officer, 2=guildleader
+/*14352*/ uint8_t unknown14352[12];
+/*14364*/ uint32_t  exp;                // Current Experience
+/*14368*/ uint8_t unknown14368[12];
+/*14380*/ uint8_t   languages[MAX_KNOWN_LANGS]; // List of languages
+/*14405*/ uint8_t   unknown14405[7];    // All 0x00 (language buffer?)
+/*14412*/ float     y;                  // Players y position
+/*14416*/ float     x;                  // Players x position
+/*14420*/ float     z;                  // Players z position
+/*14424*/ float     heading;            // Players heading   
+/*14428*/ uint8_t   unknown14428[4];    // ***Placeholder
+/*14432*/ uint32_t  platinum_bank;      // Platinum Pieces in Bank
+/*14436*/ uint32_t  gold_bank;          // Gold Pieces in Bank
+/*14440*/ uint32_t  silver_bank;        // Silver Pieces in Bank
+/*14444*/ uint32_t  copper_bank;        // Copper Pieces in Bank
+/*14448*/ uint32_t  platinum_shared;    // Shared platinum pieces
+/*14452*/ uint8_t unknown14452[84];
+/*14536*/ uint32_t  expansions;         // Bitmask for expansions
+/*14540*/ uint8_t unknown14540[12];
+/*14552*/ uint32_t  autosplit;          // 0 = off, 1 = on
+/*14556*/ uint8_t unknown14556[16];
+/*14572*/ uint16_t  zoneId;             // see zones.h
+/*14574*/ uint16_t  zoneInstance;       // Instance id
+/*14576*/ char      groupMembers[MAX_GROUP_MEMBERS][64];// all the members in group, including self 
+/*14960*/ char      groupLeader[64];    // Leader of the group ?
+/*15024*/ uint8_t unknown15024[660];
+/*15684*/ uint32_t  leadAAActive;       // 0 = leader AA off, 1 = leader AA on
+/*15688*/ uint8_t unknown15688[136];
+/*15824*/ uint32_t  ldon_guk_points;    // Earned GUK points
+/*15828*/ uint32_t  ldon_mir_points;    // Earned MIR points
+/*15832*/ uint32_t  ldon_mmc_points;    // Earned MMC points
+/*15836*/ uint32_t  ldon_ruj_points;    // Earned RUJ points
+/*15840*/ uint32_t  ldon_tak_points;    // Earned TAK points
+/*15844*/ uint32_t  ldon_avail_points;  // Available LDON points
+/*15848*/ uint8_t unknown15848[136];
+/*15984*/ uint32_t  tributeTime;        // Time remaining on tribute (millisecs)
+/*15988*/ uint32_t  careerTribute;      // Total favor points for this char
+/*15992*/ uint32_t  unknown15992;       // *** Placeholder
+/*15996*/ uint32_t  currentTribute;     // Current tribute points
+/*16000*/ uint32_t  unknown16000;       // *** Placeholder
+/*16004*/ uint32_t  tributeActive;      // 0 = off, 1=on
+/*16008*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout
+/*16048*/ uint8_t unknown16048[8];
+/*16056*/ uint32_t  expGroupLeadAA;     // Current group lead exp points (format though??)
+/*16060*/ uint32_t unknown16060;
+/*16064*/ uint32_t  expRaidLeadAA;      // Current raid lead AA exp points (format though??)
+/*16068*/ uint32_t  groupLeadAAUnspent; // Unspent group lead AA points
+/*16072*/ uint32_t  raidLeadAAUnspent;  // Unspent raid lead AA points
+/*16076*/ uint32_t  leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks
+/*16204*/ uint8_t unknown16204[128];
+/*16332*/ uint32_t  airRemaining;       // Air supply (seconds)
+/*16336*/ uint8_t unknown16336[4608];
+/*20944*/ uint32_t expAA;               // Exp earned in current AA point
+/*20948*/ uint8_t unknown21252[40];
+/*20988*/ uint32_t currentRadCrystals;  // Current count of radiant crystals
+/*20992*/ uint32_t careerRadCrystals;   // Total count of radiant crystals ever
+/*20996*/ uint32_t currentEbonCrystals; // Current count of ebon crystals
+/*21000*/ uint32_t careerEbonCrystals;  // Total count of ebon crystals ever
+/*21004*/ uint8_t  groupAutoconsent;    // 0=off, 1=on
+/*21005*/ uint8_t  raidAutoconsent;     // 0=off, 1=on
+/*21006*/ uint8_t  guildAutoconsent;    // 0=off, 1=on
+/*21007*/ uint8_t  unknown21311[5];     // ***Placeholder (6/29/2005)
+/*21012*/ uint32_t showhelm;            // 0=no, 1=yes
+/*21016*/ uint8_t  unknown21016[1032];  // ***Placeholder (2/13/2007)
+/*22048*/
 };
 
 #if 0
@@ -1811,6 +1810,7 @@
 /*0008*/ int16_t  param1;                 // Paramater 1
 /*0010*/ int16_t  param2;                 // Paramater 2
 /*0012*/ uint8_t  unknown0012[4];         // *** Placeholder
+/*0016*/
 };
 
 /*

Modified: showeq/trunk/src/xmlpreferences.cpp
===================================================================
--- showeq/trunk/src/xmlpreferences.cpp	2007-02-03 20:32:28 UTC (rev 667)
+++ showeq/trunk/src/xmlpreferences.cpp	2007-02-14 05:44:03 UTC (rev 668)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2002-2003 Zaphod (do...@us...). 
+ * Copyright 2002-2003,2007 Zaphod (do...@us...). 
  *     All Rights Reserved.
  *
  * Contributed to ShowEQ by Zaphod (do...@us...) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [667] showeq/branches/qt3to4_Z/src

From: <do...@us...> - 2007-02-03 20:32:31

Revision: 667
          http://seq.svn.sourceforge.net/seq/?rev=667&view=rev
Author:   dohpaz
Date:     2007-02-03 12:32:28 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
Do the easy to do porting.
Clean up a bunch of distracting warnings.
Now begins the hard part...

Modified Paths:
--------------
    showeq/branches/qt3to4_Z/src/category.cpp
    showeq/branches/qt3to4_Z/src/category.h
    showeq/branches/qt3to4_Z/src/combatlog.h
    showeq/branches/qt3to4_Z/src/compass.cpp
    showeq/branches/qt3to4_Z/src/compassframe.cpp
    showeq/branches/qt3to4_Z/src/datetimemgr.h
    showeq/branches/qt3to4_Z/src/editor.cpp
    showeq/branches/qt3to4_Z/src/experiencelog.cpp
    showeq/branches/qt3to4_Z/src/filter.cpp
    showeq/branches/qt3to4_Z/src/filter.h
    showeq/branches/qt3to4_Z/src/fixpt.h
    showeq/branches/qt3to4_Z/src/group.cpp
    showeq/branches/qt3to4_Z/src/group.h
    showeq/branches/qt3to4_Z/src/guild.cpp
    showeq/branches/qt3to4_Z/src/guildlist.cpp
    showeq/branches/qt3to4_Z/src/guildshell.cpp
    showeq/branches/qt3to4_Z/src/guildshell.h
    showeq/branches/qt3to4_Z/src/interface.cpp
    showeq/branches/qt3to4_Z/src/interface.h
    showeq/branches/qt3to4_Z/src/logger.h
    showeq/branches/qt3to4_Z/src/map.cpp
    showeq/branches/qt3to4_Z/src/map.h
    showeq/branches/qt3to4_Z/src/mapcore.cpp
    showeq/branches/qt3to4_Z/src/mapcore.h
    showeq/branches/qt3to4_Z/src/mapicon.cpp
    showeq/branches/qt3to4_Z/src/mapicon.h
    showeq/branches/qt3to4_Z/src/messagefilterdialog.cpp
    showeq/branches/qt3to4_Z/src/messages.cpp
    showeq/branches/qt3to4_Z/src/messageshell.cpp
    showeq/branches/qt3to4_Z/src/messagewindow.cpp
    showeq/branches/qt3to4_Z/src/packet.cpp
    showeq/branches/qt3to4_Z/src/packet.h
    showeq/branches/qt3to4_Z/src/packetformat.cpp
    showeq/branches/qt3to4_Z/src/packetinfo.cpp
    showeq/branches/qt3to4_Z/src/packetlog.cpp
    showeq/branches/qt3to4_Z/src/packetstream.cpp
    showeq/branches/qt3to4_Z/src/player.cpp
    showeq/branches/qt3to4_Z/src/seqwindow.cpp
    showeq/branches/qt3to4_Z/src/spawn.cpp
    showeq/branches/qt3to4_Z/src/spawnlist.cpp
    showeq/branches/qt3to4_Z/src/spawnlist2.cpp
    showeq/branches/qt3to4_Z/src/spawnlistcommon.cpp
    showeq/branches/qt3to4_Z/src/spawnmonitor.cpp
    showeq/branches/qt3to4_Z/src/spawnpointlist.cpp
    showeq/branches/qt3to4_Z/src/spawnshell.cpp
    showeq/branches/qt3to4_Z/src/spawnshell.h
    showeq/branches/qt3to4_Z/src/spelllist.cpp
    showeq/branches/qt3to4_Z/src/statlist.cpp
    showeq/branches/qt3to4_Z/src/xmlconv.cpp
    showeq/branches/qt3to4_Z/src/xmlpreferences.cpp
    showeq/branches/qt3to4_Z/src/xmlpreferences.h
    showeq/branches/qt3to4_Z/src/zonemgr.cpp

Modified: showeq/branches/qt3to4_Z/src/category.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/category.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/category.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -30,6 +30,7 @@
 #include <Q3HBoxLayout>
 #include <QLabel>
 #include <Q3VBoxLayout>
+#include <QTextStream>
 
 // ------------------------------------------------------
 // Category
@@ -95,8 +96,8 @@
 
    QLabel *colorLabel = new QLabel ("Color", this);
    colorLabel->setFont(labelFont);
-   colorLabel->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
-   row1Layout->addWidget(colorLabel, 0, AlignLeft);
+   colorLabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+   row1Layout->addWidget(colorLabel, 0, Qt::AlignLeft);
 
    m_Color = new QPushButton(this, "color");
    m_Color->setText("...");
@@ -107,7 +108,7 @@
 
    QLabel *nameLabel = new QLabel ("Name", this);
    nameLabel->setFont(labelFont);
-   nameLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+   nameLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
    row4Layout->addWidget(nameLabel);
 
    m_Name = new QLineEdit(this, "Name");
@@ -116,7 +117,7 @@
 
    QLabel *filterLabel = new QLabel ("Filter", this);
    filterLabel->setFont(labelFont);
-   filterLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+   filterLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
    row3Layout->addWidget(filterLabel);
 
    m_Filter  = new QLineEdit(this, "Filter");
@@ -125,7 +126,7 @@
 
    QLabel *filteroutLabel = new QLabel ("FilterOut", this);
    filteroutLabel->setFont(labelFont);
-   filteroutLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+   filteroutLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
    row2Layout->addWidget(filteroutLabel);
 
    m_FilterOut  = new QLineEdit(this, "FilterOut");
@@ -133,10 +134,10 @@
    row2Layout->addWidget(m_FilterOut);
 
    QPushButton *ok = new QPushButton("OK", this);
-   row0Layout->addWidget(ok, 0, AlignLeft);
+   row0Layout->addWidget(ok, 0, Qt::AlignLeft);
 
    QPushButton *cancel = new QPushButton("Cancel", this);
-   row0Layout->addWidget(cancel, 0, AlignRight);
+   row0Layout->addWidget(cancel, 0, Qt::AlignRight);
 
    // Hook on pressing the buttons
    connect(ok, SIGNAL(clicked()), SLOT(accept()));

Modified: showeq/branches/qt3to4_Z/src/category.h
===================================================================
--- showeq/branches/qt3to4_Z/src/category.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/category.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -85,7 +85,7 @@
   QLineEdit* m_Name;
   QLineEdit* m_Filter;
   QLineEdit* m_FilterOut;
-  QButton* m_Color;
+  QPushButton* m_Color;
 };
 
 typedef QList<Category> CategoryList;

Modified: showeq/branches/qt3to4_Z/src/combatlog.h
===================================================================
--- showeq/branches/qt3to4_Z/src/combatlog.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/combatlog.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -53,7 +53,7 @@
 	int		getMaxDamage() { return m_iMaxDamage; };
 	int		getTotalDamage() { return m_iTotalDamage; };
 
-	void	addMiss(int iMissReason) { m_iMisses++; };
+	void	addMiss(int /*iMissReason*/) { m_iMisses++; };
 	void	addHit(int iDamage);
 
 private:

Modified: showeq/branches/qt3to4_Z/src/compass.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/compass.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/compass.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -119,9 +119,9 @@
    tmp.begin (&pix);
 
    tmp.setBrush(QColor(64, 64, 64));
-   tmp.setPen(darkGray);
+   tmp.setPen(Qt::darkGray);
    tmp.drawEllipse(0,0,pix.width(), pix.height());
-   tmp.setPen(gray);
+   tmp.setPen(Qt::gray);
    tmp.drawLine(0,phd2, pix.width(), phd2);
    tmp.drawLine(pwd2,0, pwd2, pix.height());
    tmp.drawLine(pwd4, phd4, 
@@ -131,19 +131,19 @@
    tmp.translate(pwd2, phd2);
 
    tmp.rotate (-m_ang);
-   tmp.setBrush(blue);
-   tmp.setPen(blue);
+   tmp.setBrush(Qt::blue);
+   tmp.setPen(Qt::blue);
    tmp.drawLine(0-pwd4, 0, pwd2, 0);
    tmp.drawLine(0,0-phd4, 0, phd4);
-   tmp.setBrush(red);
-   tmp.setPen(red);
+   tmp.setBrush(Qt::red);
+   tmp.setPen(Qt::red);
    tmp.drawLine(0, 1, pwd2, 1);
    tmp.drawLine(0, -1, pwd4, -1);
-   tmp.setBrush(blue);
-   tmp.setPen(red);
+   tmp.setBrush(Qt::blue);
+   tmp.setPen(Qt::red);
    tmp.drawEllipse (0-5, 0-5, 10, 10);
-   tmp.setBrush(red);
-   tmp.setPen(red);
+   tmp.setBrush(Qt::red);
+   tmp.setPen(Qt::red);
    tmp.drawEllipse ((pwd2) -2, -2, 4, 4);
 
    if (m_dSpawnAngle > 0)
@@ -151,8 +151,8 @@
       tmp.resetXForm();
       tmp.translate(pwd2, phd2);
       tmp.rotate(-m_dSpawnAngle);
-      tmp.setPen(green);
-      tmp.setBrush(green);
+      tmp.setPen(Qt::green);
+      tmp.setBrush(Qt::green);
       tmp.drawEllipse(pwd2 -2, -2, 4, 4);
    }
 

Modified: showeq/branches/qt3to4_Z/src/compassframe.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/compassframe.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/compassframe.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -35,12 +35,12 @@
       QLabel *labelx = new QLabel(showeq_params->retarded_coords?"E/W:":"X:",
 				  coordsbox);
       labelx->setFixedHeight(labelx->sizeHint().height());
-      labelx->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+      labelx->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
       
       // Create the xpos label
       m_x = new QLabel("----",coordsbox);
       m_x->setFixedHeight(m_x->sizeHint().height());
-      m_x->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
+      m_x->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
     } 
     else 
     {
@@ -48,24 +48,24 @@
       QLabel *labely = new QLabel(showeq_params->retarded_coords?"N/S:":"Y:",
 				  coordsbox);
       labely->setFixedHeight(labely->sizeHint().height());
-      labely->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+      labely->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
       
       // Create the ypos label
       m_y = new QLabel("----",coordsbox);
       m_y->setFixedHeight(m_y->sizeHint().height());
-      m_y->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
+      m_y->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
     }
    }
   
   // Create the z: label
   QLabel *labelz = new QLabel("Z:",coordsbox);
   labelz->setFixedHeight(labelz->sizeHint().height());
-  labelz->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+  labelz->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
   
   // Create the zpos label
   m_z = new QLabel("----",coordsbox);
   m_z->setFixedHeight(m_z->sizeHint().height());      
-  m_z->setAlignment(QLabel::AlignRight|QLabel::AlignVCenter);
+  m_z->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
   // connect
   connect(player, SIGNAL(posChanged(int16_t,int16_t,int16_t,
@@ -91,7 +91,7 @@
 }
 
 void CompassFrame::posChanged(int16_t x, int16_t y, int16_t z,
-			      int16_t deltaX, int16_t deltaY, int16_t deltaZ,
+			      int16_t /*deltaX*/, int16_t /*deltaY*/, int16_t /*deltaZ*/,
 			      int32_t heading)
 {
   // set compass info

Modified: showeq/branches/qt3to4_Z/src/datetimemgr.h
===================================================================
--- showeq/branches/qt3to4_Z/src/datetimemgr.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/datetimemgr.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -18,8 +18,9 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-#include <qobject.h>
-#include <qdatetime.h>
+#include <QObject>
+#include <QDateTime>
+#include <QTimer>
 
 struct timeOfDayStruct;
 

Modified: showeq/branches/qt3to4_Z/src/editor.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/editor.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/editor.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -1,4 +1,3 @@
-
 /*
  * editor.cpp
  *
@@ -25,7 +24,7 @@
 #include <q3mainwindow.h> 
 #include <q3filedialog.h> 
 #include <qtoolbutton.h> 
-#include <q3textstream.h> 
+#include <QTextStream> 
 #include <qpaintdevice.h> 
 #include <qobject.h> 
 #include <q3multilineedit.h>
@@ -107,13 +106,13 @@
      menuBar()->insertItem( "&File", file );
  
      id = file->insertItem( openIcon, "&Open",
-                            this, SLOT(load()), CTRL+Key_O );
+                            this, SLOT(load()), Qt::CTRL+Qt::Key_O );
  
      id = file->insertItem( saveIcon, "&Save",
-                            this, SLOT(save()), CTRL+Key_S );
+                            this, SLOT(save()), Qt::CTRL+Qt::Key_S );
 
      file->insertSeparator();
-     file->insertItem( "&Close Editor", this, SLOT(close()), CTRL+Key_W );
+     file->insertItem( "&Close Editor", this, SLOT(close()), Qt::CTRL+Qt::Key_W );
 
      e = new Q3MultiLineEdit( this, "editor" );
      e->setFocus();
@@ -149,8 +148,8 @@
      e->setAutoUpdate( FALSE );
      e->clear();
 
-     Q3TextStream t(&f);
-     while ( !t.eof() ) {
+     QTextStream t(&f);
+     while ( !t.atEnd() ) {
          QString s = t.readLine();
          e->append( s );
      }
@@ -180,7 +179,7 @@
          return;
      }
 
-     Q3TextStream t( &f );
+     QTextStream t( &f );
      t << text;
      f.close();
 

Modified: showeq/branches/qt3to4_Z/src/experiencelog.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/experiencelog.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/experiencelog.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -9,7 +9,6 @@
 
 
 #include "experiencelog.h"
-#include "map.h"
 #include "util.h"
 #include "group.h"
 #include "player.h"
@@ -533,7 +532,7 @@
 
 }
 
-void ExperienceWindow::resizeEvent ( QResizeEvent *e ) 
+void ExperienceWindow::resizeEvent ( QResizeEvent* /*e*/ ) 
 {
   //   int mh = m_menu_bar->height() + 4;
 

Modified: showeq/branches/qt3to4_Z/src/filter.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/filter.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/filter.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -123,7 +123,7 @@
       // if a hyphen was specified, but no max value after it, it means
       // all values above min
       if (levelString.isEmpty())
-        maxLevel = INT_MAX;
+        maxLevel = 255;
       else
       {
         // get the max level
@@ -197,7 +197,7 @@
 {
 }
 
-bool FilterItem::save(QString& indent, Q3TextStream& out)
+bool FilterItem::save(QString& indent, QTextStream& out)
 {
   out << indent << "<oldfilter>";
 
@@ -289,7 +289,7 @@
 //
 // parses the filter file and builds filter list
 //
-bool Filter::save(QString& indent, Q3TextStream& out)
+bool Filter::save(QString& indent, QTextStream& out)
 {
   FilterItem *re;
 
@@ -516,13 +516,13 @@
     return false;
 
   // create a QTextStream object on the QFile object
-  Q3TextStream out(&file);
+  QTextStream out(&file);
   
   // set the output encoding to be UTF8
-  out.setEncoding(Q3TextStream::UnicodeUTF8);
+  out.setEncoding(QTextStream::UnicodeUTF8);
 
   // set the number output to be left justified decimal
-  out.setf(Q3TextStream::dec | Q3TextStream::left);
+  out.setf(QTextStream::dec | QTextStream::left);
 
   // print document header
   out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl

Modified: showeq/branches/qt3to4_Z/src/filter.h
===================================================================
--- showeq/branches/qt3to4_Z/src/filter.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/filter.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -20,7 +20,7 @@
 #include <qlist.h>
 #include <qregexp.h>
 #include <qxml.h>
-#include <q3textstream.h>
+#include <QTextStream>
 
 #include <map>
 
@@ -47,7 +47,7 @@
   FilterItem(const QString& filterPattern, bool caseSensitive, 
 	     uint8_t minLevel, uint8_t maxLevel);
   ~FilterItem(void);
-   bool save(QString& indent, Q3TextStream& out);
+   bool save(QString& indent, QTextStream& out);
 
   bool isFiltered(const QString& filterString, uint8_t level) const;
 
@@ -76,7 +76,7 @@
    Filter(bool caseSensitive = 0);
    ~Filter();
 
-   bool save(QString& indent, Q3TextStream& out);
+   bool save(QString& indent, QTextStream& out);
    bool isFiltered(const QString& filterString, uint8_t level);
    bool addFilter(const QString& filterPattern);
    bool addFilter(const QString& filterPattern, uint8_t minLevel, uint8_t maxLevel);

Modified: showeq/branches/qt3to4_Z/src/fixpt.h
===================================================================
--- showeq/branches/qt3to4_Z/src/fixpt.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/fixpt.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -80,13 +80,13 @@
 }
 
 template <class _T, class _I> inline
-_T fixPtMulI(_T a, qType q, _I b) 
+_T fixPtMulI(_T a, qType /*q*/, _I b) 
 { 
   return (a * b); 
 }
 
 template <class _T, class _I> inline
-_T fixPtDivI(_T a, qType q, _I b) 
+_T fixPtDivI(_T a, qType /*q*/, _I b) 
 { 
   return (a / b); 
 }

Modified: showeq/branches/qt3to4_Z/src/group.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/group.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/group.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -14,6 +14,8 @@
 #include "everquest.h"
 #include "diagnosticmessages.h"
 
+#include <QTextStream>
+
 GroupMgr::GroupMgr(SpawnShell* spawnShell, 
 		   Player* player,  
 		   QObject* parent, const char* name)
@@ -268,7 +270,7 @@
   }
 }
 
-void GroupMgr::dumpInfo(Q3TextStream& out)
+void GroupMgr::dumpInfo(QTextStream& out)
 {
   // dump general group manager information
   out << "[GroupMgr]" << endl;

Modified: showeq/branches/qt3to4_Z/src/group.h
===================================================================
--- showeq/branches/qt3to4_Z/src/group.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/group.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -10,13 +10,16 @@
 
 #include <stdint.h>
 
-#include <qobject.h>
-#include <qstring.h>
+#include <QObject>
+#include <QString>
+
 #include "everquest.h"
 
 
 //----------------------------------------------------------------------
 // forward declarations
+class QTextStream;
+
 class Player;
 class SpawnShell;
 class Item;
@@ -50,7 +53,7 @@
   void killSpawn(const Item* item);
 
   // dump debug info
-  void dumpInfo(Q3TextStream& out);
+  void dumpInfo(QTextStream& out);
 
  signals:
   void added(const QString& name, const Spawn* mem);

Modified: showeq/branches/qt3to4_Z/src/guild.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guild.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guild.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -20,7 +20,7 @@
 
 #include <qfile.h>
 #include <qdatastream.h>
-#include <q3textstream.h>
+#include <QTextStream>
 
 GuildMgr::GuildMgr(QString fn, QObject* parent, const char* name)
   : QObject(parent, name)
@@ -49,7 +49,7 @@
   readGuildList();
 }
 
-void GuildMgr::writeGuildList(const worldGuildListStruct* gls, size_t len)
+void GuildMgr::writeGuildList(const worldGuildListStruct* gls, size_t /*len*/)
 {
   QFile guildsfile(guildsFileName);
 
@@ -110,7 +110,7 @@
 void GuildMgr::guildList2text(QString fn)
 {
   QFile guildsfile(fn);
-  Q3TextStream guildtext(&guildsfile);
+  QTextStream guildtext(&guildsfile);
 
     if (guildsfile.exists()) {
          if (!guildsfile.remove()) {
@@ -128,7 +128,7 @@
 
    for (unsigned int i =0 ; i < m_guildMap.size(); i++) 
    {
-       if (m_guildMap[i])
+       if (!m_guildMap[i].isEmpty())
           guildtext << i << "\t" << m_guildMap[i] << endl;
    }
 
@@ -142,7 +142,7 @@
 {
    for (unsigned int i = 0; i < m_guildMap.size(); i++) 
    {
-     if (m_guildMap[i])
+     if (!m_guildMap[i].isEmpty())
        seqInfo("%d\t%s", i, (const char*)m_guildMap[i]);
    }
 }

Modified: showeq/branches/qt3to4_Z/src/guildlist.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guildlist.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guildlist.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -159,22 +159,22 @@
 
   // Guild Name
   m_guildName = new QLabel("Guild", this);
-  m_guildName->setAlignment(AlignLeft|AlignVCenter|SingleLine);
+  m_guildName->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|SingleLine);
   m_guildName->setFrameShape(LineEditPanel);
   m_guildName->setFrameShadow(Sunken);
   m_guildName->setMinimumWidth(50);
   m_guildName->setMaximumWidth(300);
-  hLayout->addWidget(m_guildName, 1, AlignLeft);
+  hLayout->addWidget(m_guildName, 1, Qt::AlignLeft);
   guildChanged();
 
   // Guild Totals
   m_guildTotals = new QLabel("", this);
-  m_guildTotals->setAlignment(AlignRight|AlignVCenter|SingleLine);
+  m_guildTotals->setAlignment(Qt::AlignRight|Qt::AlignVCenter|SingleLine);
   m_guildTotals->setFrameShape(LineEditPanel);
   m_guildTotals->setFrameShadow(Sunken);
   m_guildTotals->setMinimumWidth(30);
   m_guildTotals->setMaximumWidth(120);
-  hLayout->addWidget(m_guildTotals, 0, AlignRight);
+  hLayout->addWidget(m_guildTotals, 0, Qt::AlignRight);
 
   // create the spawn listview
   m_guildList = new SEQListView(preferenceName(), 
@@ -441,7 +441,7 @@
     m_guildList->setColumnVisible(colnum, true);
 }
 
-void GuildListWindow::set_font(int id)
+void GuildListWindow::set_font(int /*id*/)
 {
   QFont newFont;
   bool ok = false;
@@ -455,7 +455,7 @@
       setWindowFont(newFont);
 }
 
-void GuildListWindow::set_caption(int id)
+void GuildListWindow::set_caption(int /*id*/)
 {
   bool ok = false;
 

Modified: showeq/branches/qt3to4_Z/src/guildshell.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guildshell.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guildshell.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -15,7 +15,8 @@
 #include "everquest.h"
 #include "diagnosticmessages.h"
 
-#include <qdatetime.h>
+#include <QDateTime>
+#include <QTextStream>
 
 //----------------------------------------------------------------------
 // diagnostic defines
@@ -174,7 +175,7 @@
     return m_zoneMgr->zoneNameFromID(zoneid);
 }
 
-void GuildShell::dumpMembers(Q3TextStream& out)
+void GuildShell::dumpMembers(QTextStream& out)
 {
   QDateTime dt;
   GuildMemberDictIterator it(m_members);
@@ -184,8 +185,8 @@
   QString dateFormat("ddd MMM dd hh:mm:ss yyyy");
   
   // calculate the maximum class name width
-  size_t maxClassNameLength = 0;
-  for (uint8_t i = 1; i <= PLAYER_CLASSES; i++)
+  int maxClassNameLength = 0;
+  for (int i = 1; i <= PLAYER_CLASSES; i++)
     if (classString(i).length() > maxClassNameLength)
       maxClassNameLength = classString(i).length();
     
@@ -291,7 +292,7 @@
 #endif // 
 }
 
-void GuildShell::guildMemberUpdate(const uint8_t* data, size_t len)
+void GuildShell::guildMemberUpdate(const uint8_t* data, size_t /*len*/)
 {
   const GuildMemberUpdate* gmu = (const GuildMemberUpdate*)data;
 

Modified: showeq/branches/qt3to4_Z/src/guildshell.h
===================================================================
--- showeq/branches/qt3to4_Z/src/guildshell.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/guildshell.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -20,7 +20,7 @@
 
 //----------------------------------------------------------------------
 // forward declarations
-class Q3TextStream;
+class QTextStream;
 
 class NetStream;
 class ZoneMgr;
@@ -85,9 +85,9 @@
   GuildShell(ZoneMgr* zoneMgr, QObject* parent = 0, const char* name = 0);
   ~GuildShell();
   const GuildMemberDict& members() { return m_members; }
-  size_t maxNameLength() { return m_maxNameLength; }
+  int maxNameLength() { return m_maxNameLength; }
 
-  void dumpMembers(Q3TextStream& out);
+  void dumpMembers(QTextStream& out);
   
   QString zoneString(uint16_t zoneid) const;
 
@@ -105,7 +105,7 @@
  protected:
 
   GuildMemberDict m_members;
-  size_t m_maxNameLength;
+  int m_maxNameLength;
   ZoneMgr* m_zoneMgr;
 };
 

Modified: showeq/branches/qt3to4_Z/src/interface.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/interface.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/interface.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -73,16 +73,14 @@
 #include <q3accel.h>
 #include <qfileinfo.h>
 #include <qfile.h>
-#include <q3textstream.h>
+#include <QTextStream>
 #include <qinputdialog.h>
 #include <qfontdialog.h>
 #include <qcolordialog.h>
 #include <q3dockarea.h>
 #include <qwindowsstyle.h>
-#include <qplatinumstyle.h>
 #include <qmotifstyle.h>
 #include <qcdestyle.h>
-#include <qsgistyle.h>
 //Added by qt3to4:
 #include <Q3PtrList>
 #include <Q3PopupMenu>
@@ -359,9 +357,9 @@
    setDockEnabled(m_expWindow, 
 		  pSEQPrefs->getPrefBool("DockableExperienceWindow",
 					 section, false));
-   Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+   Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					   m_expWindow->preferenceName(),
-					   DockUnmanaged);
+					   Qt::DockUnmanaged);
    addDockWindow(m_expWindow, edge, false);
    m_expWindow->undock();
 
@@ -519,25 +517,25 @@
    //pFileMenu = new QPopupMenu;
    Q3PopupMenu* pFileMenu = new Q3PopupMenu;
    menuBar()->insertItem("&File", pFileMenu);
-   pFileMenu->insertItem("&Save Preferences", this, SLOT(savePrefs()), CTRL+Key_S);
-   pFileMenu->insertItem("Open &Map", m_mapMgr, SLOT(loadMap()), Key_F1);
+   pFileMenu->insertItem("&Save Preferences", this, SLOT(savePrefs()), Qt::CTRL+Qt::Key_S);
+   pFileMenu->insertItem("Open &Map", m_mapMgr, SLOT(loadMap()), Qt::Key_F1);
    pFileMenu->insertItem("&Import &Map", m_mapMgr, SLOT(importMap()));
-   pFileMenu->insertItem("Sa&ve Map", m_mapMgr, SLOT(saveMap()), Key_F2);
+   pFileMenu->insertItem("Sa&ve Map", m_mapMgr, SLOT(saveMap()), Qt::Key_F2);
    pFileMenu->insertItem("Save SOE Map", m_mapMgr, SLOT(saveSOEMap()));
    pFileMenu->insertItem("Reload Guilds File", m_guildmgr, SLOT(readGuildList()));
-   pFileMenu->insertItem("Add Spawn Category", this, SLOT(addCategory()) , ALT+Key_C);
-   pFileMenu->insertItem("Rebuild SpawnList", this, SLOT(rebuildSpawnList()) , ALT+Key_R);
-   pFileMenu->insertItem("Reload Categories", this, SLOT(reloadCategories()) , CTRL+Key_R);
-   pFileMenu->insertItem("Select Next", this, SLOT(selectNext()), CTRL+Key_Right);
-   pFileMenu->insertItem("Select Prev", this, SLOT(selectPrev()), CTRL+Key_Left);
+   pFileMenu->insertItem("Add Spawn Category", this, SLOT(addCategory()) , Qt::ALT+Qt::Key_C);
+   pFileMenu->insertItem("Rebuild SpawnList", this, SLOT(rebuildSpawnList()) , Qt::ALT+Qt::Key_R);
+   pFileMenu->insertItem("Reload Categories", this, SLOT(reloadCategories()) , Qt::CTRL+Qt::Key_R);
+   pFileMenu->insertItem("Select Next", this, SLOT(selectNext()), Qt::CTRL+Qt::Key_Right);
+   pFileMenu->insertItem("Select Prev", this, SLOT(selectPrev()), Qt::CTRL+Qt::Key_Left);
    pFileMenu->insertItem("Save Selected Spawns Path", 
 			 this, SLOT(saveSelectedSpawnPath(void)));
    pFileMenu->insertItem("Save NPC Spawn Paths",
 			 this, SLOT(saveSpawnPaths(void)));
    if (m_packet->playbackPackets() != PLAYBACK_OFF)
    {
-     pFileMenu->insertItem("Inc Playback Speed", m_packet, SLOT(incPlayback()), CTRL+Key_X);
-     pFileMenu->insertItem("Dec Playback Speed", m_packet, SLOT(decPlayback()), CTRL+Key_Z);
+     pFileMenu->insertItem("Inc Playback Speed", m_packet, SLOT(incPlayback()), Qt::CTRL+Qt::Key_X);
+     pFileMenu->insertItem("Dec Playback Speed", m_packet, SLOT(decPlayback()), Qt::CTRL+Qt::Key_Z);
    }
    pFileMenu->insertItem("&Quit", qApp, SLOT(quit()));
 
@@ -909,7 +907,7 @@
    m_id_opt_KeepSelectedVisible =
                   pOptMenu->insertItem("Keep Selected Visible?"  , this, SLOT(toggle_opt_KeepSelectedVisible()));
    m_id_opt_LogSpawns = pOptMenu->insertItem("Log Spawns", this, SLOT(toggle_opt_LogSpawns()));
-   m_id_opt_BazaarData    = pOptMenu->insertItem("Bazaar Searches", this, SLOT(toggle_opt_BazaarData()), Key_F11);
+   m_id_opt_BazaarData    = pOptMenu->insertItem("Bazaar Searches", this, SLOT(toggle_opt_BazaarData()), Qt::Key_F11);
    menuBar()->setItemChecked (m_id_opt_BazaarData, (m_bazaarLog != 0));
    m_id_opt_ResetMana = pOptMenu->insertItem("Reset Max Mana", this, SLOT(resetMaxMana()));
    m_id_opt_PvPTeams  = pOptMenu->insertItem("PvP Teams", this, SLOT(toggle_opt_PvPTeams()));
@@ -1013,14 +1011,14 @@
    Q3PopupMenu* pLogMenu = new Q3PopupMenu;
    m_netMenu->insertItem("Lo&g", pLogMenu);
    pLogMenu->setCheckable(true);
-   m_id_log_AllPackets  = pLogMenu->insertItem("All Packets", this, SLOT(toggle_log_AllPackets()), Key_F5);
-   m_id_log_WorldData   = pLogMenu->insertItem("World Data", this, SLOT(toggle_log_WorldData()), Key_F6);
-   m_id_log_ZoneData    = pLogMenu->insertItem("Zone Data", this, SLOT(toggle_log_ZoneData()), Key_F7);
-   m_id_log_UnknownData = pLogMenu->insertItem("Unknown Data", this, SLOT(toggle_log_UnknownData()), Key_F8);
+   m_id_log_AllPackets  = pLogMenu->insertItem("All Packets", this, SLOT(toggle_log_AllPackets()), Qt::Key_F5);
+   m_id_log_WorldData   = pLogMenu->insertItem("World Data", this, SLOT(toggle_log_WorldData()), Qt::Key_F6);
+   m_id_log_ZoneData    = pLogMenu->insertItem("Zone Data", this, SLOT(toggle_log_ZoneData()), Qt::Key_F7);
+   m_id_log_UnknownData = pLogMenu->insertItem("Unknown Data", this, SLOT(toggle_log_UnknownData()), Qt::Key_F8);
    m_id_view_UnknownData = pLogMenu->insertItem("View Unknown Data", this, 
 						 SLOT(toggle_view_UnknownData()) , 
-						 Key_F9);
-   m_id_log_RawData     = pLogMenu->insertItem("Raw Data", this, SLOT(toggle_log_RawData()), Key_F10);
+						 Qt::Key_F9);
+   m_id_log_RawData     = pLogMenu->insertItem("Raw Data", this, SLOT(toggle_log_RawData()), Qt::Key_F10);
    menuBar()->setItemChecked (m_id_log_AllPackets, (m_globalLog != 0));
    menuBar()->setItemChecked (m_id_log_WorldData, (m_worldLog != 0));
    menuBar()->setItemChecked (m_id_log_ZoneData, (m_zoneLog != 0));
@@ -1042,7 +1040,7 @@
    
    pOpCodeMenu->setItemChecked(x, (m_opcodeMonitorLog != 0));
    pOpCodeMenu->insertItem("&Reload Monitored OpCode List..", this,
-			  SLOT(set_opcode_monitored_list()), CTRL+ALT+Key_R);
+			  SLOT(set_opcode_monitored_list()), Qt::CTRL+ALT+Qt::Key_R);
   section = "OpCodeMonitoring";
    x =pOpCodeMenu->insertItem("&View Monitored OpCode Matches", this,
 			      SLOT(toggle_opcode_view(int)));
@@ -1127,13 +1125,13 @@
    menuBar()->insertItem( "Fi&lters" , filterMenu);
    filterMenu->setCheckable(true);
 
-   filterMenu->insertItem("&Reload Filters", m_filterMgr, SLOT(loadFilters()), Key_F3);
-   filterMenu->insertItem("&Save Filters", m_filterMgr, SLOT(saveFilters()), Key_F4);
+   filterMenu->insertItem("&Reload Filters", m_filterMgr, SLOT(loadFilters()), Qt::Key_F3);
+   filterMenu->insertItem("&Save Filters", m_filterMgr, SLOT(saveFilters()), Qt::Key_F4);
    filterMenu->insertItem("&Edit Filters", this, SLOT(launch_editor_filters()));
    filterMenu->insertItem("Select Fil&ter File", this, SLOT(select_filter_file()));
 
-   filterMenu->insertItem("Reload &Zone Filters", m_filterMgr, SLOT(loadZoneFilters()), SHIFT+Key_F3);
-   filterMenu->insertItem("S&ave Zone Filters", m_filterMgr, SLOT(saveZoneFilters()), SHIFT+Key_F4);
+   filterMenu->insertItem("Reload &Zone Filters", m_filterMgr, SLOT(loadZoneFilters()), SHIFT+Qt::Key_F3);
+   filterMenu->insertItem("S&ave Zone Filters", m_filterMgr, SLOT(saveZoneFilters()), SHIFT+Qt::Key_F4);
    filterMenu->insertItem("Edit Zone Fi&lters", this, SLOT(launch_editor_zoneFilters()));
 
    filterMenu->insertItem("Re&filter Spawns", m_spawnShell, SLOT(refilterSpawns()));
@@ -1493,20 +1491,20 @@
    Q3PopupMenu* pDebugMenu = new Q3PopupMenu;
    menuBar()->insertItem("&Debug", pDebugMenu);
    pDebugMenu->insertItem("List I&nterface", this, SLOT(listInterfaceInfo()));
-   pDebugMenu->insertItem("List S&pawns", this, SLOT(listSpawns()), ALT+CTRL+Key_P);
-   pDebugMenu->insertItem("List &Drops", this, SLOT(listDrops()), ALT+CTRL+Key_D);
-   pDebugMenu->insertItem("List &Map Info", this, SLOT(listMapInfo()), ALT+CTRL+Key_M);
+   pDebugMenu->insertItem("List S&pawns", this, SLOT(listSpawns()), Qt::ALT+Qt::CTRL+Qt::Key_P);
+   pDebugMenu->insertItem("List &Drops", this, SLOT(listDrops()), Qt::ALT+Qt::CTRL+Qt::Key_D);
+   pDebugMenu->insertItem("List &Map Info", this, SLOT(listMapInfo()), Qt::ALT+Qt::CTRL+Qt::Key_M);
    pDebugMenu->insertItem("List G&uild Info", m_guildmgr, SLOT(listGuildInfo()));
-   pDebugMenu->insertItem("List &Group", this, SLOT(listGroup()), ALT+CTRL+Key_G);
-   pDebugMenu->insertItem("List Guild M&embers", this, SLOT(listGuild()), ALT+CTRL+Key_E);
-   pDebugMenu->insertItem("Dump Spawns", this, SLOT(dumpSpawns()), ALT+SHIFT+CTRL+Key_P);
-   pDebugMenu->insertItem("Dump Drops", this, SLOT(dumpDrops()), ALT+SHIFT+CTRL+Key_D);
-   pDebugMenu->insertItem("Dump Map Info", this, SLOT(dumpMapInfo()), ALT+SHIFT+CTRL+Key_M);
+   pDebugMenu->insertItem("List &Group", this, SLOT(listGroup()), Qt::ALT+Qt::CTRL+Qt::Key_G);
+   pDebugMenu->insertItem("List Guild M&embers", this, SLOT(listGuild()), Qt::ALT+Qt::CTRL+Qt::Key_E);
+   pDebugMenu->insertItem("Dump Spawns", this, SLOT(dumpSpawns()), Qt::ALT+SHIFT+Qt::CTRL+Qt::Key_P);
+   pDebugMenu->insertItem("Dump Drops", this, SLOT(dumpDrops()), Qt::ALT+SHIFT+Qt::CTRL+Qt::Key_D);
+   pDebugMenu->insertItem("Dump Map Info", this, SLOT(dumpMapInfo()), Qt::ALT+SHIFT+Qt::CTRL+Qt::Key_M);
    pDebugMenu->insertItem("Dump Guild Info", this , SLOT(dumpGuildInfo()));
    pDebugMenu->insertItem("Dump SpellBook Info", this , SLOT(dumpSpellBook()));
-   pDebugMenu->insertItem("Dump Group", this, SLOT(dumpGroup()), ALT+CTRL+SHIFT+Key_G);
-   pDebugMenu->insertItem("Dump Guild Members", this, SLOT(dumpGuild()), ALT+CTRL+SHIFT+Key_E);
-   pDebugMenu->insertItem("List &Filters", m_filterMgr, SLOT(listFilters()), ALT+CTRL+Key_F);
+   pDebugMenu->insertItem("Dump Group", this, SLOT(dumpGroup()), Qt::ALT+Qt::CTRL+SHIFT+Qt::Key_G);
+   pDebugMenu->insertItem("Dump Guild Members", this, SLOT(dumpGuild()), Qt::ALT+Qt::CTRL+SHIFT+Qt::Key_E);
+   pDebugMenu->insertItem("List &Filters", m_filterMgr, SLOT(listFilters()), Qt::ALT+Qt::CTRL+Qt::Key_F);
    pDebugMenu->insertItem("List &Zone Filters", m_filterMgr, SLOT(listZoneFilters()));
 
 ////////////////////
@@ -2134,15 +2132,15 @@
    show();
 
    Q3Accel *accel = new Q3Accel(this);
-   accel->connectItem( accel->insertItem(CTRL+ALT+Key_S), this, SLOT(toggle_view_statusbar()));
-   accel->connectItem( accel->insertItem(CTRL+ALT+Key_T), this, SLOT(toggle_view_menubar()));
+   accel->connectItem( accel->insertItem(Qt::CTRL+Qt::ALT+Qt::Key_S), this, SLOT(toggle_view_statusbar()));
+   accel->connectItem( accel->insertItem(Qt::CTRL+Qt::ALT+Qt::Key_T), this, SLOT(toggle_view_menubar()));
 
    // load in the docking preferences if any have been saved
    QString dockPrefs = pSEQPrefs->getPrefString("DockingInfo", section, 
 						QString());
    if (!dockPrefs.isEmpty())
    {
-     Q3TextStream ts(&dockPrefs, QIODevice::ReadOnly);
+     QTextStream ts(&dockPrefs, QIODevice::ReadOnly);
      ts >> *this;
    }
 
@@ -2787,7 +2785,7 @@
   }
 }
 
-void EQInterface::set_main_Font(int id)
+void EQInterface::set_main_Font(int /*id*/)
 {
   QString name = "ShowEQ - Application Font";
   bool ok = false;
@@ -2813,7 +2811,7 @@
 }
 
 
-void EQInterface::select_main_FormatFile(int id)
+void EQInterface::select_main_FormatFile(int /*id*/)
 {
   QString formatFile = pSEQPrefs->getPrefString("FormatFile", "Interface", 
 						"eqstr_us.txt");
@@ -2835,7 +2833,7 @@
   }
 }
 
-void EQInterface::select_main_SpellsFile(int id)
+void EQInterface::select_main_SpellsFile(int /*id*/)
 {
   QString spellsFile = pSEQPrefs->getPrefString("SpellsFile", "Interface", 
 						"spells_us.txt");
@@ -2934,7 +2932,7 @@
   pSEQPrefs->setPrefBool(preference, "Interface_StatusBar", show);
 }
 
-void EQInterface::set_main_statusbar_Font(int id)
+void EQInterface::set_main_statusbar_Font(int /*id*/)
 {
   QString name = "ShowEQ - Status Font";
   bool ok = false;
@@ -3000,7 +2998,7 @@
      QString tempStr;
 
      QString dockPrefs;
-     Q3TextStream ts(&dockPrefs, QIODevice::WriteOnly);
+     QTextStream ts(&dockPrefs, QIODevice::WriteOnly);
 
      ts << *this;
 
@@ -3175,7 +3173,7 @@
   QString outText;
 
   // open the output data stream
-  Q3TextStream out(&outText, QIODevice::WriteOnly);
+  QTextStream out(&outText, QIODevice::WriteOnly);
   
    // dump the spawns 
   m_spawnShell->dumpSpawns(tSpawn, out);
@@ -3191,7 +3189,7 @@
   QString outText;
 
   // open the output data stream
-  Q3TextStream out(&outText, QIODevice::WriteOnly);
+  QTextStream out(&outText, QIODevice::WriteOnly);
 
   // dump the drops
   m_spawnShell->dumpSpawns(tDrop, out);
@@ -3207,7 +3205,7 @@
   QString outText;
 
   // open the output data stream
-  Q3TextStream out(&outText, QIODevice::WriteOnly);
+  QTextStream out(&outText, QIODevice::WriteOnly);
 
   // dump map managers info
   m_mapMgr->dumpInfo(out);
@@ -3232,7 +3230,7 @@
   QString outText;
 
   // open the output data stream
-  Q3TextStream out(&outText, QIODevice::WriteOnly);
+  QTextStream out(&outText, QIODevice::WriteOnly);
 
   out << "Map window layout info:" << endl;
   out << "-----------------------" << endl;
@@ -3251,7 +3249,7 @@
   QString outText;
 
   // open the output data stream
-  Q3TextStream out(&outText, QIODevice::WriteOnly);
+  QTextStream out(&outText, QIODevice::WriteOnly);
 
   // dump the drops
   m_groupMgr->dumpInfo(out);
@@ -3268,7 +3266,7 @@
   QString outText;
 
   // open the output data stream
-  Q3TextStream out(&outText, QIODevice::WriteOnly);
+  QTextStream out(&outText, QIODevice::WriteOnly);
 
   // dump the drops
   m_guildShell->dumpMembers(out);
@@ -3290,7 +3288,7 @@
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
   file.open(QIODevice::WriteOnly);
-  Q3TextStream out(&file);
+  QTextStream out(&file);
   
   // dump the spawns 
   m_spawnShell->dumpSpawns(tSpawn, out);
@@ -3310,7 +3308,7 @@
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
   file.open(QIODevice::WriteOnly);
-  Q3TextStream out(&file);
+  QTextStream out(&file);
 
   // dump the drops
   m_spawnShell->dumpSpawns(tDrop, out);
@@ -3331,7 +3329,7 @@
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
   file.open(QIODevice::WriteOnly);
-  Q3TextStream out(&file);
+  QTextStream out(&file);
 
   // dump map managers info
   m_mapMgr->dumpInfo(out);
@@ -3371,7 +3369,7 @@
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
   file.open(QIODevice::WriteOnly);
-  Q3TextStream out(&file);
+  QTextStream out(&file);
   QString txt;
 
   seqInfo("Dumping Spell Book to '%s'\n", 
@@ -3427,7 +3425,7 @@
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
   file.open(QIODevice::WriteOnly);
-  Q3TextStream out(&file);
+  QTextStream out(&file);
 
   // dump the drops
   m_groupMgr->dumpInfo(out);
@@ -3447,7 +3445,7 @@
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
   file.open(QIODevice::WriteOnly);
-  Q3TextStream out(&file);
+  QTextStream out(&file);
 
   // dump the drops
   m_guildShell->dumpMembers(out);
@@ -4222,8 +4220,8 @@
 }
 
 void EQInterface::setExp(uint32_t totalExp, uint32_t totalTick,
-			  uint32_t minExpLevel, uint32_t maxExpLevel, 
-			  uint32_t tickExpLevel)
+			 uint32_t /*minExpLevel*/, uint32_t /*maxExpLevel*/, 
+			 uint32_t /*tickExpLevel*/)
 {
   if (m_stsbarExp)
   {
@@ -4283,17 +4281,17 @@
 }
 
 void EQInterface::setAltExp(uint32_t totalExp,
-			    uint32_t maxExp, uint32_t tickExp, 
-			    uint32_t aapoints)
+			    uint32_t /*maxExp*/, uint32_t /*tickExp*/, 
+			    uint32_t /*aapoints*/)
 {
   if (m_stsbarExpAA)
     m_stsbarExpAA->setText(QString("ExpAA: %1").arg(totalExp));
 }
 
-void EQInterface::newAltExp(uint32_t newExp, uint32_t totalExp, 
+void EQInterface::newAltExp(uint32_t /*newExp*/, uint32_t totalExp, 
 			    uint32_t totalTick, 
-			    uint32_t maxExp, uint32_t tickExp, 
-			    uint32_t aapoints)
+			    uint32_t /*maxExp*/, uint32_t /*tickExp*/, 
+			    uint32_t /*aapoints*/)
 {
   if (m_stsbarExpAA)
   {
@@ -4317,7 +4315,7 @@
 // TODO:  clear after timeout miliseconds
 //
 void
-EQInterface::stsMessage(const QString &string, int timeout)
+EQInterface::stsMessage(const QString &string, int /*timeout*/)
 {
   if (m_stsbarStatus)
     m_stsbarStatus->setText(string);
@@ -4388,7 +4386,7 @@
    m_stsbarPkt->setText(tempStr);
 }
 
-void EQInterface::attack2Hand1(const uint8_t* data)
+void EQInterface::attack2Hand1(const uint8_t* /*data*/)
 {
   // const attack2Struct * atk2 = (const attack2Struct*)data;
 }
@@ -4443,7 +4441,7 @@
     m_stsbarZEM->setText(tempStr);
 }
 
-void EQInterface::zoneEnd(const QString& shortZoneName, 
+void EQInterface::zoneEnd(const QString& /*shortZoneName*/, 
 			  const QString& longZoneName)
 {
   emit newZoneName(longZoneName);
@@ -4660,7 +4658,7 @@
   QFile mobPathFile(fileInfo.absFilePath());
   if (mobPathFile.open(QIODevice::Append | QIODevice::WriteOnly))
   {
-    Q3TextStream out(&mobPathFile);
+    QTextStream out(&mobPathFile);
     // append the selected spawns path to the end
     saveSpawnPath(out, m_selectedSpawn);
 
@@ -4680,7 +4678,7 @@
   QFile mobPathFile(fileInfo.absFilePath());
   if (mobPathFile.open(QIODevice::Truncate | QIODevice::WriteOnly))
   {
-    Q3TextStream out(&mobPathFile);
+    QTextStream out(&mobPathFile);
     // map header line
     out << m_zoneMgr->longZoneName() << ","
 	<< m_zoneMgr->shortZoneName() << ",0,0" << endl;
@@ -4700,7 +4698,7 @@
   }
 }
 
-void EQInterface::saveSpawnPath(Q3TextStream& out, const Item* item)
+void EQInterface::saveSpawnPath(QTextStream& out, const Item* item)
 {
   if (item == 0)
     return;
@@ -5018,7 +5016,7 @@
   }
 }
 
-void EQInterface::opt_clearChannelMsgs(int id)
+void EQInterface::opt_clearChannelMsgs(int /*id*/)
 {
   // clear the messages
   m_messages->clear();
@@ -5345,8 +5343,8 @@
 		  pSEQPrefs->getPrefBool(QString("Dockable") + mapPrefName,
 					 "Interface", true));
 
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", m_map[i]->preferenceName(),
-					    Left);
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", m_map[i]->preferenceName(),
+					    Qt::Left);
     addDockWindow(m_map[i], mapName, edge, true);
     if (!m_isMapDocked[i])
       m_map[i]->undock();
@@ -5404,9 +5402,9 @@
    setDockEnabled(m_messageWindow[i], 
 		  pSEQPrefs->getPrefBool(QString("Dockable") + prefName,
 					 "Interface", false));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_messageWindow[i]->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_messageWindow[i], edge, false);
     if (!m_isMessageWindowDocked[i])
       m_messageWindow[i]->undock();
@@ -5441,9 +5439,9 @@
 		   pSEQPrefs->getPrefBool("DockableSpawnList",
 					  "Interface", true));
 
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_spawnList->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_spawnList, edge, false);
     if (m_isSpawnListDocked)
       m_spawnList->undock();
@@ -5488,9 +5486,9 @@
    setDockEnabled(m_spawnList2, 
 		  pSEQPrefs->getPrefBool("DockableSpawnList2",
 					 "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_spawnList2->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_spawnList2, edge, false);
     if (!m_isSpawnList2Docked)
       m_spawnList2->undock();
@@ -5534,10 +5532,10 @@
       setDockEnabled(m_spawnPointList, 
 		     pSEQPrefs->getPrefBool("DockableSpawnPointList",
 					    "Interface", true));
-      Dock edge = 
+      Qt::Dock edge = 
 	(Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 				    m_spawnPointList->preferenceName(),
-				    Left);
+				    Qt::Left);
       addDockWindow(m_spawnPointList, edge, false);
       if (!m_isSpawnPointListDocked)
 	m_spawnPointList->undock();
@@ -5574,9 +5572,9 @@
     setDockEnabled(m_statList, 
 		   pSEQPrefs->getPrefBool("DockablePlayerStats",
 					  "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_statList->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_statList, edge, false);
     if (!m_isStatListDocked)
       m_statList->undock();
@@ -5613,9 +5611,9 @@
     setDockEnabled(m_skillList, 
 		   pSEQPrefs->getPrefBool("DockablePlayerSkills",
 					  "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_skillList->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_skillList, edge, false);
     if (!m_isSkillListDocked)
       m_skillList->undock();
@@ -5652,9 +5650,9 @@
     setDockEnabled(m_spellList, 
 		   pSEQPrefs->getPrefBool("DockableSpellList",
 					  "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_spellList->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_spellList, edge, false);
     if (!m_isSpellListDocked)
       m_spellList->undock();
@@ -5701,9 +5699,9 @@
     setDockEnabled(m_compass, 
 		   pSEQPrefs->getPrefBool("DockableCompass",
 					  "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_compass->preferenceName(),
-					    Left);
+					    Qt::Left);
     addDockWindow(m_compass, edge, false);
     if (!m_isCompassDocked)
       m_compass->undock();
@@ -5738,9 +5736,9 @@
     setDockEnabled(m_netDiag, 
 		   pSEQPrefs->getPrefBool("DockableNetDiag",
 					  "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_netDiag->preferenceName(),
-					    Bottom);
+					    Qt::Bottom);
     addDockWindow(m_netDiag, edge, true);
     m_netDiag->undock();
 
@@ -5772,9 +5770,9 @@
     setDockEnabled(m_guildListWindow, 
 		   pSEQPrefs->getPrefBool("DockableGuildListWindow",
 					  "Interface", true));
-    Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
+    Qt::Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					    m_guildListWindow->preferenceName(),
-					    Bottom);
+					    Qt::Bottom);
     addDockWindow(m_guildListWindow, edge, true);
     m_guildListWindow->undock();
 
@@ -6031,10 +6029,10 @@
 
 void EQInterface::setDockEnabled(Q3DockWindow* dw, bool enable)
 {
-  Q3MainWindow::setDockEnabled(dw, DockTop, enable);
-  Q3MainWindow::setDockEnabled(dw, DockBottom, enable);
-  Q3MainWindow::setDockEnabled(dw, DockLeft, enable);
-  Q3MainWindow::setDockEnabled(dw, DockRight, enable);
+  Q3MainWindow::setDockEnabled(dw, Qt::DockTop, enable);
+  Q3MainWindow::setDockEnabled(dw, Qt::DockBottom, enable);
+  Q3MainWindow::setDockEnabled(dw, Qt::DockLeft, enable);
+  Q3MainWindow::setDockEnabled(dw, Qt::DockRight, enable);
 }
 
 #ifndef QMAKEBUILD

Modified: showeq/branches/qt3to4_Z/src/interface.h
===================================================================
--- showeq/branches/qt3to4_Z/src/interface.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/interface.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -168,7 +168,7 @@
    void selectPrev(void);
    void saveSelectedSpawnPath(void);
    void saveSpawnPaths(void);
-   void saveSpawnPath(Q3TextStream& out, const Item* item);
+   void saveSpawnPath(QTextStream& out, const Item* item);
    void toggle_log_AllPackets();
    void toggle_log_WorldData();
    void toggle_log_ZoneData();

Modified: showeq/branches/qt3to4_Z/src/logger.h
===================================================================
--- showeq/branches/qt3to4_Z/src/logger.h	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/logger.h	2007-02-03 20:32:28 UTC (rev 667)
@@ -10,7 +10,7 @@
 
 #include <qobject.h>
 #include <qfile.h>
-#include <q3textstream.h>
+#include <QTextStream>
 
 #ifdef __FreeBSD__ 
 // since they are incapable of following standards
@@ -37,7 +37,7 @@
  protected:
    FILE* m_fp;
    QFile m_file;
-   Q3TextStream m_out;
+   QTextStream m_out;
    QString m_filename;
    bool m_errOpen;
 };

Modified: showeq/branches/qt3to4_Z/src/map.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/map.cpp	2007-02-03 14:32:01 UTC (rev 666)
+++ showeq/branches/qt3to4_Z/src/map.cpp	2007-02-03 20:32:28 UTC (rev 667)
@@ -51,9 +51,11 @@
 #include <qtimer.h>
 #include <q3strlist.h>
 #include <qimage.h>
+#include <QTextStream>
 
 #if 1 // ZBTEMP: Until we setup a better way to enter location name/color
 #include <qinputdialog.h>
+#endif
 //Added by qt3to4:
 #include <QPaintEvent>
 #include <Q3VBoxLayout>
@@ -64,7 +66,7 @@
 #include <Q3PopupMenu>
 #include <Q3HBoxLayout>
 #include <QMouseEvent>
-#endif
+#include <QDesktopWidget>
 
 //----------------------------------------------------------------------
 // Macros
@@ -99,7 +101,7 @@
   colorLabel->setFont(labelFont);
   colorLabel->setFixedHeight(colorLabel->sizeHint().height());
   colorLabel->setFixedWidth(colorLabel->sizeHint().width()+10);
-  colorLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+  colorLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
   row1Layout->addWidget(colorLabel);
   
   m_LineColor = new QComboBox(FALSE, this, "LineColor");
@@ -122,13 +124,13 @@
   m_LineColor->setFont(labelFont);
   m_LineColor->setFixedHeight(m_LineColor->sizeHint().height());
   m_LineColor->setFixedWidth(m_LineColor->sizeHint().width());
-  row1Layout->addWidget(m_LineColor, 0, AlignLeft);
+  row1Layout->addWidget(m_LineColor, 0, Qt::AlignLeft);
   
   m_ColorPreview = new Q3Frame(this);
   m_ColorPreview->setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
   m_ColorPreview->setFixedWidth(50);
   m_ColorPreview->setFixedHeight(m_LineColor->sizeHint().height());
-  m_ColorPreview->setPalette(QPalette(QColor(gray)));
+  m_ColorPreview->setPalette(QPalette(Qt::gray));
   row1Layout->addWidget(m_ColorPreview);
   
   // Hook on when a color changes
@@ -139,7 +141,7 @@
   nameLabel->setFont(labelFont);
   nameLabel->setFixedHeight(nameLabel->sizeHint().height());
   nameLabel->setFixedWidth(nameLabel->sizeHint().width()+5);
-  nameLabel->setAlignment(QLabel::AlignLeft|QLabel::AlignVCenter);
+  nameLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
   row2Layout->addWidget(nameLabel);
 
   m_LineName  = new QLineEdit(this, "LineName");
@@ -154,7 +156,7 @@
   QPushButton *ok = new QPushButton("OK", this);
   ok->setFixedWidth(30);
   ok->setFixedHeight(30);
-  topLayout->addWidget(ok, 0, AlignCenter);
+  topLayout->addWidget(ok, 0, Qt::AlignCenter);
   
   // Hook on pressing the OK button
   connect(ok, SIGNAL(clicked()), SLOT(accept()));
@@ -180,8 +182,8 @@
 // MapLabel
 MapLabel::MapLabel( Map* map )
   : QLabel(map, "mapLabel", 
-       Qt::WStyle_Customize + Qt::WStyle_NoBorder + Qt::WStyle_Tool + Qt::WType_TopLevel
-       + Qt::WType_Dialog + Qt::WX11BypassWM)
+       Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WType_TopLevel
+       | Qt::WType_Dialog | Qt::WX11BypassWM)
 {
   m_Map = map;
   setMargin( 1 );
@@ -189,7 +191,7 @@
   setAutoMask( false );
   setFrameStyle( Q3Frame::Plain | Q3Frame::Box );
   setLineWidth( 1 );
-  setAlignment( AlignLeft | AlignTop );
+  setAlignment( Qt::AlignLeft | Qt::AlignTop );
   polish();
   setText( "" );
   adjustSize();        
@@ -203,7 +205,7 @@
   // borrowed from QPopupMenu::popup()
 
   // get info about the widget and its environment
-  QWidget *desktop = QApplication::desktop();
+  QDesktopWidget *desktop = QApplication::desktop();
   int sw = desktop->width();                  // screen width
   int sh = desktop->height();                 // screen height
   int sx = desktop->x();                      // screen pos
@@ -323,7 +325,7 @@
   loadZoneMap(shortZoneName);
 }
 
-void MapMgr::zoneEnd(const QString& shortZoneName, const QString& longZoneName)
+void MapMgr::zoneEnd(const QString& shortZoneName, const QString& /*longZoneName*/)
 {
 #ifdef DEBUGMAP
   debug ("zoneEnd(%s, %s)", 
@@ -684,29 +686,29 @@
 #endif
 }
 
-void MapMgr::dumpInfo(Q3TextStream& out)
+void MapMgr::dumpInfo(QTextStream& myout)
 {
-  out << "[MapMgr]" << endl;
-  out << "DefaultLineColor: " << m_curLineColor << endl;
-  out << "DefaultLineName: " << m_curLineName << endl;
-  out << "DefaultLocationColor: " << m_curLocationColor << endl;
-  out << "ImageLoaded: " << m_mapData.imageLoaded() << endl;
-  out << "MapLoaded: " << m_mapData.mapLoaded() << endl;
-  out << "MapFileName: " << m_mapData.fileName() << endl;
-  out << "ZoneShortName: " << m_mapData.zoneShortName() << endl;
-  out << "ZoneLongName: " << m_mapData.zoneLongName() << endl;
-  out << "boundingRect: top(" << m_mapData.boundingRect().top() 
+  myout << QString("[MapMgr]\n");
+  myout << "\nDefaultLineColor: " << m_curLineColor;
+  myout << "\nDefaultLineName: " << m_curLineName;
+  myout << "\nDefaultLocationColor: " << m_curLocationColor;
+  myout << "\nImageLoaded: " << m_mapData.imageLoaded();
+  myout << "\nMapLoaded: " << m_mapData.mapLoaded();
+  myout << "\nMapFileName: " << m_mapData.fileName();
+  myout << "\nZoneShortName: " << m_mapData.zoneShortName();
+  myout << "\nZoneLongName: " << m_mapData.zoneLongName();
+  myout << "\nboundingRect: top(" << m_mapData.boundingRect().top() 
       << ") bottom(" << m_mapData.boundingRect().bottom() 
       << ") left(" << m_mapData.boundingRect().left()
-      << ") right(" << m_mapData.boundingRect().right() << ") " << endl;
-  out << "size: width(" << m_mapData.size().width()
-      << ") height(" << m_mapData.size().height() << ")" << endl;
-  out << "ZoneZEM: " << m_mapData.zoneZEM() << endl;
-  out << "LLines: " << m_mapData.lLines().count() << endl;
-  out << "MLines: " << m_mapData.mLines().count() << endl;
-  out << "Locations: " << m_mapData.locations().count() << endl;
-  out << "Aggros: " << m_mapData.aggros().count() << endl;
-  out << endl;
+      << ") right(" << m_mapData.boundingRect().right() << ") ";
+  myout << "\nsize: width(" << m_mapData.size().width()
+      << ") height(" << m_mapData.size().height() << ")";
+  myout << "\nZoneZEM: " << m_mapData.zoneZEM();
+  myout << "\nLLines: " << m_mapData.lLines().count();
+  myout << "\nMLines: " << m_mapData.mLines().count();
+  myout << "\nLocations: " << m_mapData.locations().count();
+  myout << "\nAggros: " << m_mapData.aggros().count();
+  myout << endl;
 }
 
 //----------------------------------------------------------------------
@@ -833,19 +835,6 @@
 #endif
   m_id_showSub = insertItem("Show", subMenu);
   
-
-  subMenu = new Q3PopupMenu;
-  subMenu->setCheckable(true);
-  m_id_mapOptimization_Memory = subMenu->insertItem("Memory");
-  subMenu->setItemParameter(m_id_mapOptimization_Memory, tMap_MemoryOptim); 
- m_id_mapOptimization_Normal = subMenu->insertItem("Normal");
-  subMenu->setItemParameter(m_id_mapOptimization_Normal, tMap_NormalOptim);
-  m_id_mapOptimization_Best = subMenu->insertItem("Speed");
-  subMenu->setItemParameter(m_id_mapOptimization_Best, tMap_BestOptim);
-  connect(subMenu, SIGNAL(activated(int)),
-      this, SLOT(select_mapOptimization(int)));
-  m_id_mapOptimization = insertItem("Map Optimization", subMenu);
-
   m_id_gridTickColor = insertItem("Grid Tick Color...",
                   this, SLOT(select_gridTickColor(int)));
   m_id_gridLineColor = insertItem("Grid Line Color...",
@@ -998,12 +987,7 @@
 #ifdef DEBUG
   setItemChecked(m_id_debugInfo, m_map->showDebugInfo());
 #endif
-  MapOptimizationMethod method = m_map->mapOptimization();
 
-  setItemChecked(m_id_mapOptimization_Memory, (method == tMap_MemoryOptim));
-  setItemChecked(m_id_mapOptimization_Normal, (method == tMap_NormalOptim));
-  setItemChecked(m_id_mapOptimization_Best, (method == tMap_BestOptim));
-
   m_drawSizeSpinBox->setValue(m_mapIcons->drawSize());
 
   m_fovSpinBox->setValue(m_mapIcons->fovDistance());
@@ -1072,132 +1056,132 @@
   m_map->setMapLineStyle((MapLineStyle)itemParameter(itemId));
 }
 
-void MapMenu::toggle_spawnDepthFilter(int itemId)
+void MapMenu::toggle_spawnDepthFilter(int /*itemId*/)
 {
   m_map->setSpawnDepthFilter(!m_map->spawnDepthFilter());
 }
 
-void MapMenu::toggle_tooltip(int itemId)
+void MapMenu::toggle_tooltip(int /*itemId*/)
 {
   m_map->setShowTooltips(!m_map->showTooltips());
 }
 
-void MapMenu::toggle_filtered(int itemId)
+void MapMenu::toggle_filtered(int /*itemId*/)
 {
   m_map->setShowFiltered(!m_map->showFiltered());
 }
 
-void MapMenu::toggle_map(int itemId)
+void MapMenu::toggle_map(int /*itemId*/)
 {
   m_map->setShowLines(!m_map->showLines());
 }
 
-void MapMenu::toggle_pvp(int itemId)
+void MapMenu::toggle_pvp(int /*itemId*/)
 {
   m_map->setPvP(!m_map->pvp());
 }
 
-void MapMenu::toggle_deityPvP(int itemId)
+void MapMenu::toggle_deityPvP(int /*itemId*/)
 {
   m_map->setDeityPvP(!m_map->deityPvP());
 }
 
-void MapMenu::toggle_racePvP(int itemId)
+void MapMenu::toggle_racePvP(int /*itemId*/)
 {
   m_map->setRacePvP(!m_map->racePvP());
 }
 
-void MapMenu::toggle_velocity(int itemId)
+void MapMenu::toggle_velocity(int /*itemId*/)
 {
   m_map->setShowVelocityLines(!m_map->showVelocityLines());
 }
 
-void MapMenu::toggle_animate(int itemId)
+void MapMenu::toggle_animate(int /*itemId*/)
 {
   m_map->setAnimate(!m_map->animate());
 }
 
-void MapMenu::toggle_player(int itemId)
+void MapMenu::toggle_player(int /*itemId*/)
 {
   m_map->setShowPlayer(!m_map->showPlayer());
 }
 
-void MapMenu::toggle_playerBackground(int itemId)
+void MapMenu::toggle_playerBackground(int /*itemId*/)
 {
   m_map->setShowPlayerBackground(!m_map->showPlayerBackground());
 }
 
-void MapMenu::toggle_playerView(int itemId)
+void MapMenu::toggle_playerView(int /*itemId*/)
 {
   m_map->setShowPlayerView(!m_map->showPlayerView());
 }
 
-void MapMenu::toggle_gridLines(int itemId)
+void MapMenu::toggle_gridLines(int /*itemId*/)
 {
   m_map->setShowGridLines(!m_map->showGridLines());
 }
 
-void MapMenu::toggle_gridTicks(int itemId)
+void MapMenu::toggle_gridTicks(int /*itemId*/)
 {
   m_map->setShowGridTicks(!m_map->showGridTicks());
 }
 
-void MapMenu::toggle_locations(int itemId)
+void MapMenu::toggle_locations(int /*itemId*/)
 {
   m_map->setShowLocations(!m_map->showLocations());
 }
 
-void MapMenu::toggle_spawns(int itemId)
+void MapMenu::toggle_spawns(int /*itemId*/)
 {
   m_map->setShowSpawns(!m_map->showSpawns());
 }
 
-void MapMenu::toggle_spawnPnts(int itemId)
+void MapMenu::toggle_spawnPnts(int /*itemId*/)
 {
   m_map->setShowSpawnPoints(!m_map->showSpawnPoints());
 }
 
-void MapMenu::toggle_unknownSpawns(int itemId)
+void MapMenu::toggle_unknownSpawns(int /*itemId*/)
 {
   m_map->setShowUnknownSpawns(!m_map->showUnknownSpawns());
 }
 
-void MapMenu::toggle_drops(int itemId)
+void MapMenu::toggle_drops(int /*itemId*/)
 {
   m_map->setShowDrops(!m_map->showDrops());
 }
 
-void MapMenu::toggle_doors(int itemId)
+void MapMenu::toggle_doors(int /*itemId*/)
 {
   m_map->setShowDoors(!m_map->showDoors());
 }
 
-void MapMenu::toggle_spawnNames(int itemId)
+void MapMenu::toggle_spawnNames(int /*itemId*/)
 {
   m_mapIcons->setShowSpawnNames(!m_mapIcons->showSpawnNames());
 }
 
-void MapMenu::toggle_highlightConsideredSpawns(int itemId)
+void MapMenu::toggle_highlightConsideredSpawns(int /*itemId*/)
 {
   m_map->setHighlightConsideredSpawns(!m_map->highlightConsideredSpawns());
 }
 
-void MapMenu::toggle_walkPath(int itemId)
+void MapMenu::toggle_walkPath(int /*itemId*/)
 {
   m_map->setWalkPathShowSelect(!m_map->walkPathShowSelect());
 }
 
-void MapMenu::toggle_npcWalkPaths(int itemId)
+void MapMenu::toggle_npcWalkPaths(int /*itemId*/)
 {
   m_mapIcons->setShowNPCWalkPaths(!m_mapIcons->showNPCWalkPaths());
 }
 
-void MapMenu::toggle_mapImage(int itemId)
+void MapMenu::toggle_mapImage(int /*itemId*/)
 {
   m_map->setShowBackgroundImage(!m_map->showBackgroundImage());
 }
 
-void MapMenu::toggle_debugInfo(int itemId)
+void MapMenu::toggle_debugInfo(int /*itemId*/)
 {
 #ifdef DEBUG
   m_map->setShowDebugInfo(!m_map->showDebugInfo());
@@ -1214,18 +1198,13 @@
   m_map->setCacheChanges(!m_map->cacheChanges());
 }
 
-void MapMenu::toggle_zoneSafePoint(int itemId)
+void MapMenu::toggle_zoneSafePoint(int /*itemId*/)
 {
   m_map->setShowZoneSafePoint(!m_map->showZoneSafePoint());
 }
 
-void MapMenu::select_mapOptimization(int itemId)
+void MapMenu::select_gridTickColor(int /*itemId*/)
 {
-  m_map->setMapOptimization((MapOptimizationMethod)itemParameter(itemId));
-}
-
-void MapMenu::select_gridTickColor(int itemId)
-{
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
     + " Grid Tick Color";
   QColor newColor = QColorDialog::getColor(m_map->gridTickColor(),
@@ -1235,7 +1214,7 @@
     m_map->setGridTickColor(newColor);
 }
 
-void MapMenu::select_gridLineColor(int itemId)
+void MapMenu::select_gridLineColor(int /*itemId*/)
 {
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
     + " Grid Tick Color";
@@ -1246,7 +1225,7 @@
     m_map->setGridLineCo...
 
[truncated message content]

[Seq-cvs-commit] SF.net SVN: seq: [666] showeq/branches/qt3to4_Z/src

From: <do...@us...> - 2007-02-03 14:32:11

Revision: 666
          http://seq.svn.sourceforge.net/seq/?rev=666&view=rev
Author:   dohpaz
Date:     2007-02-03 06:32:01 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
Initial output of the qt3to4 conversion program.
Doesn't build yet...

Modified Paths:
--------------
    showeq/branches/qt3to4_Z/src/category.cpp
    showeq/branches/qt3to4_Z/src/category.h
    showeq/branches/qt3to4_Z/src/combatlog.cpp
    showeq/branches/qt3to4_Z/src/combatlog.h
    showeq/branches/qt3to4_Z/src/compass.cpp
    showeq/branches/qt3to4_Z/src/compass.h
    showeq/branches/qt3to4_Z/src/compassframe.cpp
    showeq/branches/qt3to4_Z/src/compassframe.h
    showeq/branches/qt3to4_Z/src/db3conv.h
    showeq/branches/qt3to4_Z/src/editor.cpp
    showeq/branches/qt3to4_Z/src/editor.h
    showeq/branches/qt3to4_Z/src/eqstr.cpp
    showeq/branches/qt3to4_Z/src/eqstr.h
    showeq/branches/qt3to4_Z/src/experiencelog.cpp
    showeq/branches/qt3to4_Z/src/experiencelog.h
    showeq/branches/qt3to4_Z/src/filter.cpp
    showeq/branches/qt3to4_Z/src/filter.h
    showeq/branches/qt3to4_Z/src/group.cpp
    showeq/branches/qt3to4_Z/src/group.h
    showeq/branches/qt3to4_Z/src/guild.cpp
    showeq/branches/qt3to4_Z/src/guildlist.cpp
    showeq/branches/qt3to4_Z/src/guildlist.h
    showeq/branches/qt3to4_Z/src/guildshell.cpp
    showeq/branches/qt3to4_Z/src/guildshell.h
    showeq/branches/qt3to4_Z/src/interface.cpp
    showeq/branches/qt3to4_Z/src/interface.h
    showeq/branches/qt3to4_Z/src/logger.cpp
    showeq/branches/qt3to4_Z/src/logger.h
    showeq/branches/qt3to4_Z/src/main.cpp
    showeq/branches/qt3to4_Z/src/map.cpp
    showeq/branches/qt3to4_Z/src/map.h
    showeq/branches/qt3to4_Z/src/mapcore.cpp
    showeq/branches/qt3to4_Z/src/mapcore.h
    showeq/branches/qt3to4_Z/src/mapicon.cpp
    showeq/branches/qt3to4_Z/src/mapicon.h
    showeq/branches/qt3to4_Z/src/mapicondialog.ui.h
    showeq/branches/qt3to4_Z/src/message.h
    showeq/branches/qt3to4_Z/src/messagefilterdialog.cpp
    showeq/branches/qt3to4_Z/src/messagefilterdialog.h
    showeq/branches/qt3to4_Z/src/messages.h
    showeq/branches/qt3to4_Z/src/messagewindow.cpp
    showeq/branches/qt3to4_Z/src/messagewindow.h
    showeq/branches/qt3to4_Z/src/netdiag.cpp
    showeq/branches/qt3to4_Z/src/packetinfo.cpp
    showeq/branches/qt3to4_Z/src/packetinfo.h
    showeq/branches/qt3to4_Z/src/packetstream.cpp
    showeq/branches/qt3to4_Z/src/packetstream.h
    showeq/branches/qt3to4_Z/src/player.cpp
    showeq/branches/qt3to4_Z/src/pointarray.h
    showeq/branches/qt3to4_Z/src/seqlistview.cpp
    showeq/branches/qt3to4_Z/src/seqlistview.h
    showeq/branches/qt3to4_Z/src/seqwindow.cpp
    showeq/branches/qt3to4_Z/src/seqwindow.h
    showeq/branches/qt3to4_Z/src/showeq.pro
    showeq/branches/qt3to4_Z/src/skilllist.cpp
    showeq/branches/qt3to4_Z/src/skilllist.h
    showeq/branches/qt3to4_Z/src/spawnlist.cpp
    showeq/branches/qt3to4_Z/src/spawnlist.h
    showeq/branches/qt3to4_Z/src/spawnlist2.cpp
    showeq/branches/qt3to4_Z/src/spawnlist2.h
    showeq/branches/qt3to4_Z/src/spawnlistcommon.cpp
    showeq/branches/qt3to4_Z/src/spawnlistcommon.h
    showeq/branches/qt3to4_Z/src/spawnmonitor.cpp
    showeq/branches/qt3to4_Z/src/spawnmonitor.h
    showeq/branches/qt3to4_Z/src/spawnpointlist.cpp
    showeq/branches/qt3to4_Z/src/spawnpointlist.h
    showeq/branches/qt3to4_Z/src/spawnshell.cpp
    showeq/branches/qt3to4_Z/src/spawnshell.h
    showeq/branches/qt3to4_Z/src/spelllist.cpp
    showeq/branches/qt3to4_Z/src/spelllist.h
    showeq/branches/qt3to4_Z/src/spells.cpp
    showeq/branches/qt3to4_Z/src/spellshell.cpp
    showeq/branches/qt3to4_Z/src/spellshell.h
    showeq/branches/qt3to4_Z/src/statlist.cpp
    showeq/branches/qt3to4_Z/src/statlist.h
    showeq/branches/qt3to4_Z/src/xmlconv.cpp
    showeq/branches/qt3to4_Z/src/xmlpreferences.cpp
    showeq/branches/qt3to4_Z/src/xmlpreferences.h
    showeq/branches/qt3to4_Z/src/zonemgr.cpp

Modified: showeq/branches/qt3to4_Z/src/category.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/category.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/category.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -26,6 +26,10 @@
 #include <stdio.h>
 
 #include<qcolordialog.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3VBoxLayout>
 
 // ------------------------------------------------------
 // Category
@@ -82,12 +86,12 @@
    QFont labelFont;
    labelFont.setBold(true);
 
-   QBoxLayout* topLayout = new QVBoxLayout(this);
-   QBoxLayout* row4Layout = new QHBoxLayout(topLayout);
-   QBoxLayout* row3Layout = new QHBoxLayout(topLayout);
-   QBoxLayout* row2Layout = new QHBoxLayout(topLayout);
-   QBoxLayout* row1Layout = new QHBoxLayout(topLayout);
-   QBoxLayout* row0Layout = new QHBoxLayout(topLayout);
+   Q3BoxLayout* topLayout = new Q3VBoxLayout(this);
+   Q3BoxLayout* row4Layout = new Q3HBoxLayout(topLayout);
+   Q3BoxLayout* row3Layout = new Q3HBoxLayout(topLayout);
+   Q3BoxLayout* row2Layout = new Q3HBoxLayout(topLayout);
+   Q3BoxLayout* row1Layout = new Q3HBoxLayout(topLayout);
+   Q3BoxLayout* row0Layout = new Q3HBoxLayout(topLayout);
 
    QLabel *colorLabel = new QLabel ("Color", this);
    colorLabel->setFont(labelFont);

Modified: showeq/branches/qt3to4_Z/src/category.h
===================================================================
--- showeq/branches/qt3to4_Z/src/category.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/category.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -30,8 +30,8 @@
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qpushbutton.h>
 
 //----------------------------------------------------------------------

Modified: showeq/branches/qt3to4_Z/src/combatlog.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/combatlog.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/combatlog.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -12,12 +12,17 @@
 #include "util.h"
 #include "diagnosticmessages.h"
 
-#include <qgrid.h>
+#include <q3grid.h>
 #include <qtimer.h>
-#include <qhbox.h>
-#include <qvgroupbox.h>
+#include <q3hbox.h>
+#include <q3vgroupbox.h>
 #include <qmessagebox.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 #include <stdio.h>
 #include <time.h>
 
@@ -250,7 +255,7 @@
 #ifdef DEBUGCOMBAT
 	seqDebug("CombatWindow::initUI: starting...");
 #endif
-	QVBoxLayout* layout = new QVBoxLayout(boxLayout());
+	Q3VBoxLayout* layout = new Q3VBoxLayout(boxLayout());
 
 	m_menu_bar = new QMenuBar(this);
 	layout->addWidget(m_menu_bar);
@@ -267,7 +272,7 @@
 	m_widget_mob = initMobWidget();
 	m_tab->addTab(m_widget_mob, "&Mobs");
 
-	m_clear_menu = new QPopupMenu(this);
+	m_clear_menu = new Q3PopupMenu(this);
 	m_clear_menu->insertItem("Clear Offense Stats", this, SLOT(clearOffense()));
 	m_clear_menu->insertItem("Clear Mob Stats", this, SLOT(clearMob()));
 
@@ -286,9 +291,9 @@
 {
 	QWidget *pWidget = new QWidget(m_tab);
 
-	m_layout_offense = new QVBoxLayout(pWidget);
+	m_layout_offense = new Q3VBoxLayout(pWidget);
 
-	QGroupBox *listGBox = new QVGroupBox(pWidget);
+	Q3GroupBox *listGBox = new Q3VGroupBox(pWidget);
 	m_layout_offense->addWidget(listGBox);
 
 	m_listview_offense = new SEQListView(preferenceName(), listGBox);
@@ -313,10 +318,10 @@
 
 	m_listview_offense->setMinimumSize(m_listview_offense->sizeHint().width(), 200);
 
-	QGroupBox *summaryGBox = new QVGroupBox("Summary", pWidget);
+	Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
 	m_layout_offense->addWidget(summaryGBox);
 
-	QGrid *summaryGrid = new QGrid(4, summaryGBox);
+	Q3Grid *summaryGrid = new Q3Grid(4, summaryGBox);
 
 	new QLabel("Total Damage:", summaryGrid);
 	m_label_offense_totaldamage = new QLabel(summaryGrid);
@@ -336,8 +341,8 @@
 	new QLabel("Avg NonMelee:", summaryGrid);
 	m_label_offense_avgnonmelee = new QLabel(summaryGrid);
 
-	((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
-	((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(1, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(3, 1);
 	summaryGrid->layout()->setSpacing(5);
 
 	return pWidget;
@@ -346,12 +351,12 @@
 QWidget* CombatWindow::initDefenseWidget()
 {
 	QWidget *pWidget = new QWidget(m_tab);
-	m_layout_defense = new QVBoxLayout(pWidget);
+	m_layout_defense = new Q3VBoxLayout(pWidget);
 
-	QGroupBox *avoidanceGBox = new QVGroupBox("Avoidance", pWidget);
+	Q3GroupBox *avoidanceGBox = new Q3VGroupBox("Avoidance", pWidget);
 	m_layout_defense->addWidget(avoidanceGBox);
 
-	QGrid *avoidanceGrid = new QGrid(6, avoidanceGBox);
+	Q3Grid *avoidanceGrid = new Q3Grid(6, avoidanceGBox);
 
 	new QLabel("Misses:", avoidanceGrid);
 	m_label_defense_avoid_misses = new QLabel(avoidanceGrid);
@@ -371,15 +376,15 @@
 	new QLabel("Total:", avoidanceGrid);
 	m_label_defense_avoid_total = new QLabel(avoidanceGrid);
 
-	((QGridLayout *)avoidanceGrid->layout())->setColStretch(1, 1);
-	((QGridLayout *)avoidanceGrid->layout())->setColStretch(3, 1);
-	((QGridLayout *)avoidanceGrid->layout())->setColStretch(5, 1);
+	((Q3GridLayout *)avoidanceGrid->layout())->setColStretch(1, 1);
+	((Q3GridLayout *)avoidanceGrid->layout())->setColStretch(3, 1);
+	((Q3GridLayout *)avoidanceGrid->layout())->setColStretch(5, 1);
 	avoidanceGrid->layout()->setSpacing(5);
 
-	QGroupBox *mitigationGBox = new QVGroupBox("Mitigation", pWidget);
+	Q3GroupBox *mitigationGBox = new Q3VGroupBox("Mitigation", pWidget);
 	m_layout_defense->addWidget(mitigationGBox);
 
-	QGrid *mitigationGrid = new QGrid(6, mitigationGBox);
+	Q3Grid *mitigationGrid = new Q3Grid(6, mitigationGBox);
 
 	new QLabel("Avg. Hit:", mitigationGrid);
 	m_label_defense_mitigate_avghit = new QLabel(mitigationGrid);
@@ -390,15 +395,15 @@
 	new QLabel("Max:", mitigationGrid);
 	m_label_defense_mitigate_maxhit = new QLabel(mitigationGrid);
 
-	((QGridLayout *)mitigationGrid->layout())->setColStretch(1, 1);
-	((QGridLayout *)mitigationGrid->layout())->setColStretch(3, 1);
-	((QGridLayout *)mitigationGrid->layout())->setColStretch(5, 1);
+	((Q3GridLayout *)mitigationGrid->layout())->setColStretch(1, 1);
+	((Q3GridLayout *)mitigationGrid->layout())->setColStretch(3, 1);
+	((Q3GridLayout *)mitigationGrid->layout())->setColStretch(5, 1);
 	mitigationGrid->layout()->setSpacing(5);
 
-	QGroupBox *summaryGBox = new QVGroupBox("Summary", pWidget);
+	Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
 	m_layout_defense->addWidget(summaryGBox);
 
-	QGrid *summaryGrid = new QGrid(6, summaryGBox);
+	Q3Grid *summaryGrid = new Q3Grid(6, summaryGBox);
 
 	new QLabel("Mob Attacks:", summaryGrid);
 	m_label_defense_summary_mobattacks = new QLabel(summaryGrid);
@@ -409,9 +414,9 @@
 	new QLabel("Total Damage:", summaryGrid);
 	m_label_defense_summary_totaldamage = new QLabel(summaryGrid);
 
-	((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
-	((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
-	((QGridLayout *)summaryGrid->layout())->setColStretch(5, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(1, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(3, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(5, 1);
 	summaryGrid->layout()->setSpacing(5);
 
 	return pWidget;
@@ -421,9 +426,9 @@
 {
 	QWidget *pWidget = new QWidget(m_tab);
 
-	m_layout_mob = new QVBoxLayout(pWidget);
+	m_layout_mob = new Q3VBoxLayout(pWidget);
 
-	QGroupBox *listGBox = new QVGroupBox(pWidget);
+	Q3GroupBox *listGBox = new Q3VGroupBox(pWidget);
 	m_layout_mob->addWidget(listGBox);
 
 	m_listview_mob = new SEQListView(preferenceName(), listGBox);
@@ -448,10 +453,10 @@
 
 	m_listview_mob->setMinimumSize(m_listview_mob->sizeHint().width(), 200);
 
-	QGroupBox *summaryGBox = new QVGroupBox("Summary", pWidget);
+	Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
 	m_layout_mob->addWidget(summaryGBox);
 
-	QGrid *summaryGrid = new QGrid(4, summaryGBox);
+	Q3Grid *summaryGrid = new Q3Grid(4, summaryGBox);
 
 	new QLabel("Total Mobs", summaryGrid);
 	m_label_mob_totalmobs = new QLabel(summaryGrid);
@@ -465,8 +470,8 @@
 	new QLabel("Last DPS:", summaryGrid);
 	m_label_mob_lastdps = new QLabel(summaryGrid);
 
-	((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
-	((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(1, 1);
+	((Q3GridLayout *)summaryGrid->layout())->setColStretch(3, 1);
 	summaryGrid->layout()->setSpacing(5);
 
 
@@ -586,7 +591,7 @@
 		QString s_damage;
 		s_damage.setNum(iDamage);
 
-		QListViewItem *pItem = new QListViewItem(m_listview_offense,
+		Q3ListViewItem *pItem = new Q3ListViewItem(m_listview_offense,
 			s_type, s_hits, s_misses, s_ratio,
 			s_avgdamage, s_mindamage, s_maxdamage, s_damage);
 
@@ -726,7 +731,7 @@
 		QString s_mobdps = QString::number(dMobDPS);
 
 
-		QListViewItem *pItem = new QListViewItem(m_listview_mob,
+		Q3ListViewItem *pItem = new Q3ListViewItem(m_listview_mob,
 			s_time, s_name, s_id, s_duration, s_damagegiven,
 			s_dps, s_iDamageTaken, s_mobdps);
 

Modified: showeq/branches/qt3to4_Z/src/combatlog.h
===================================================================
--- showeq/branches/qt3to4_Z/src/combatlog.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/combatlog.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -12,11 +12,14 @@
 # include <qwidget.h>
 # include <qtabwidget.h>
 # include <qlist.h>
-# include <qlistview.h>
+# include <q3listview.h>
 # include <qcombobox.h>
 # include <qlabel.h>
 # include <qlayout.h>
 # include <qmenubar.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 # include <sys/time.h>
 # include <sys/types.h>
@@ -194,9 +197,9 @@
 	QWidget*	m_widget_mob;
 
 	QTabWidget*     m_tab;
-	QVBoxLayout*	m_layout_offense;
-	QVBoxLayout*	m_layout_defense;
-	QVBoxLayout*	m_layout_mob;
+	Q3VBoxLayout*	m_layout_offense;
+	Q3VBoxLayout*	m_layout_defense;
+	Q3VBoxLayout*	m_layout_mob;
 
 	SEQListView* 	m_listview_offense;
 	SEQListView* 	m_listview_mob;
@@ -232,7 +235,7 @@
 	QList<CombatMobRecord> m_combat_mob_list;
 
 	QMenuBar	*m_menu_bar;
-	QPopupMenu	*m_clear_menu;
+	Q3PopupMenu	*m_clear_menu;
 
 	int		m_iCurrentDPSTotal;
 	int		m_iDPSStartTime;

Modified: showeq/branches/qt3to4_Z/src/compass.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/compass.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/compass.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -16,6 +16,8 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qfont.h>
+//Added by qt3to4:
+#include <QPaintEvent>
 
 #include <math.h>
 #include <stdlib.h>

Modified: showeq/branches/qt3to4_Z/src/compass.h
===================================================================
--- showeq/branches/qt3to4_Z/src/compass.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/compass.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -26,6 +26,8 @@
 
 #include <qwidget.h>
 #include <qsize.h>
+//Added by qt3to4:
+#include <QPaintEvent>
 
 ///////////////////////////////////////////
 // type definitions

Modified: showeq/branches/qt3to4_Z/src/compassframe.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/compassframe.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/compassframe.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -9,6 +9,9 @@
 
 #include <qfont.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QLabel>
 
 #include "main.h"
 #include "compassframe.h"
@@ -16,10 +19,10 @@
 CompassFrame::CompassFrame(Player* player, QWidget* parent, const char* name)
   : SEQWindow("Compass", "ShowEQ - Compass", parent, name)
 {
-  QVBoxLayout* layout = new QVBoxLayout(boxLayout());
+  Q3VBoxLayout* layout = new Q3VBoxLayout(boxLayout());
   m_compass = new Compass (this, "compass");
   layout->addWidget(m_compass);
-  QHBox* coordsbox = new QHBox(this);
+  Q3HBox* coordsbox = new Q3HBox(this);
   layout->addWidget(coordsbox);
   m_compass->setFixedWidth(120);
   m_compass->setFixedHeight(120);

Modified: showeq/branches/qt3to4_Z/src/compassframe.h
===================================================================
--- showeq/branches/qt3to4_Z/src/compassframe.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/compassframe.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -8,8 +8,8 @@
 #ifndef _COMPASSFRAME_H_
 #define _COMPASSFRAME_H_
 
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
 
 #include "player.h"

Modified: showeq/branches/qt3to4_Z/src/db3conv.h
===================================================================
--- showeq/branches/qt3to4_Z/src/db3conv.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/db3conv.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -23,7 +23,7 @@
 
 #include <db_cxx.h>
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 
 #include "dbcommon.h"
@@ -75,7 +75,7 @@
    Db* GetDatabase(QString dbName);
 
    DbEnv* m_dbEnv;
-   QDict<Db> m_dbDict;
+   Q3Dict<Db> m_dbDict;
 
    // declare friend
    friend class DB3Iterator;

Modified: showeq/branches/qt3to4_Z/src/editor.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/editor.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/editor.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -18,18 +18,21 @@
 #include <errno.h>
 
 #include <qapplication.h>
-#include <qtoolbar.h> 
+#include <q3toolbar.h> 
 #include <qstatusbar.h> 
-#include <qpopupmenu.h> 
+#include <q3popupmenu.h> 
 #include <qmenubar.h> 
-#include <qmainwindow.h> 
-#include <qfiledialog.h> 
+#include <q3mainwindow.h> 
+#include <q3filedialog.h> 
 #include <qtoolbutton.h> 
-#include <qtextstream.h> 
+#include <q3textstream.h> 
 #include <qpaintdevice.h> 
 #include <qobject.h> 
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QCloseEvent>
 
 #include "util.h"
 
@@ -82,13 +85,13 @@
 };
 
 EditorWindow::EditorWindow(const char *fileName)
-     : QMainWindow( 0, "ShowEQ - Editor", WDestructiveClose )
+     : Q3MainWindow( 0, "ShowEQ - Editor", Qt::WDestructiveClose )
  {
      int id;
   
      QPixmap openIcon, saveIcon;
  
-     fileTools = new QToolBar( this, "file operations" );
+     fileTools = new Q3ToolBar( this, "file operations" );
 
      fileTools->setLabel( tr( "File Operations" ) );
  
@@ -100,7 +103,7 @@
         new QToolButton( saveIcon, "Save File", QString::null,
                                this, SLOT(save()), fileTools, "save file" );
  
-     QPopupMenu * file = new QPopupMenu( this );
+     Q3PopupMenu * file = new Q3PopupMenu( this );
      menuBar()->insertItem( "&File", file );
  
      id = file->insertItem( openIcon, "&Open",
@@ -112,7 +115,7 @@
      file->insertSeparator();
      file->insertItem( "&Close Editor", this, SLOT(close()), CTRL+Key_W );
 
-     e = new QMultiLineEdit( this, "editor" );
+     e = new Q3MultiLineEdit( this, "editor" );
      e->setFocus();
      setCentralWidget( e );
 
@@ -129,7 +132,7 @@
 
  void EditorWindow::load()
  {
-     QString fn = QFileDialog::getOpenFileName( QString::null, QString::null,
+     QString fn = Q3FileDialog::getOpenFileName( QString::null, QString::null,
                                                 this);
      if ( !fn.isEmpty() )
          load( fn );
@@ -140,13 +143,13 @@
  void EditorWindow::load( const char *fileName )
  {
      QFile f( fileName );
-     if ( !f.open( IO_ReadOnly ) )
+     if ( !f.open( QIODevice::ReadOnly ) )
          return;
 
      e->setAutoUpdate( FALSE );
      e->clear();
 
-     QTextStream t(&f);
+     Q3TextStream t(&f);
      while ( !t.eof() ) {
          QString s = t.readLine();
          e->append( s );
@@ -171,13 +174,13 @@
 
      QString text = e->text();
      QFile f( filename );
-     if ( !f.open( IO_WriteOnly ) ) {
+     if ( !f.open( QIODevice::WriteOnly ) ) {
          statusBar()->message( QString("Could not write to %1").arg(filename),
                                2000 );
          return;
      }
 
-     QTextStream t( &f );
+     Q3TextStream t( &f );
      t << text;
      f.close();
 
@@ -190,7 +193,7 @@
 
  void EditorWindow::saveAs()
  {
-     QString fn = QFileDialog::getSaveFileName( QString::null, QString::null,
+     QString fn = Q3FileDialog::getSaveFileName( QString::null, QString::null,
                                                 this );
      if ( !fn.isEmpty() ) {
          filename = fn;

Modified: showeq/branches/qt3to4_Z/src/editor.h
===================================================================
--- showeq/branches/qt3to4_Z/src/editor.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/editor.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -11,13 +11,16 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <Q3PopupMenu>
 
-class QMultiLineEdit;
-class QToolBar;
-class QPopupMenu;
+class Q3MultiLineEdit;
+class Q3ToolBar;
+class Q3PopupMenu;
 
-class EditorWindow: public QMainWindow
+class EditorWindow: public Q3MainWindow
 {
     Q_OBJECT
 public:
@@ -35,8 +38,8 @@
     void saveAs();
 
 private:
-    QMultiLineEdit *e;
-    QToolBar *fileTools;
+    Q3MultiLineEdit *e;
+    Q3ToolBar *fileTools;
     QString filename;
 };
 

Modified: showeq/branches/qt3to4_Z/src/eqstr.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/eqstr.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/eqstr.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -17,7 +17,9 @@
 #include <qregexp.h>
 #include <qfile.h>
 #include <qstringlist.h>
-#include <qvaluevector.h>
+#include <q3valuevector.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 EQStr::EQStr(int size)
   : m_messageStrings(size),
@@ -42,7 +44,7 @@
   QFile formatFile(fileName);
 
   // open the file read only
-  if (!formatFile.open(IO_ReadOnly))
+  if (!formatFile.open(QIODevice::ReadOnly))
   {
     seqWarn("EQStr: Failed to open '%s'",
 	    fileName.latin1());
@@ -50,7 +52,7 @@
   }
 
   // allocate a QCString large enough to hold the entire file
-  QCString textData(formatFile.size() + 1);
+  Q3CString textData(formatFile.size() + 1);
   
   // read in the entire file
   formatFile.readBlock(textData.data(), textData.size());
@@ -152,7 +154,7 @@
   }
   else
   {
-    QValueVector<QString> argList;
+    Q3ValueVector<QString> argList;
     argList.reserve(5); // reserve space for 5 elements to handle most common sizes
     
     // 

Modified: showeq/branches/qt3to4_Z/src/eqstr.h
===================================================================
--- showeq/branches/qt3to4_Z/src/eqstr.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/eqstr.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qstring.h>
 
 //----------------------------------------------------------------------
@@ -31,7 +31,7 @@
 			const char* arguments, size_t argslen) const;
 
  protected:
-   QIntDict<QString> m_messageStrings;
+   Q3IntDict<QString> m_messageStrings;
    bool m_loaded;
 };
 

Modified: showeq/branches/qt3to4_Z/src/experiencelog.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/experiencelog.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/experiencelog.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -20,12 +20,18 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <qgrid.h>
+#include <q3grid.h>
 #include <qtimer.h>
-#include <qhbox.h>
-#include <qvgroupbox.h>
+#include <q3hbox.h>
+#include <q3vgroupbox.h>
 #include <qmessagebox.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3GridLayout>
+#include <QLabel>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 #define DEBUGEXP
 
@@ -157,7 +163,7 @@
    m_calcZEM=0;
    m_ZEMviewtype = 0;
 
-   m_view_menu = new QPopupMenu( this );
+   m_view_menu = new Q3PopupMenu( this );
    m_view_menu->insertItem( "&All Mobs", this, SLOT(viewAll()) );
    m_view_menu->insertItem( "Previous &15 Minutes", this, SLOT(view15Minutes()) );
    m_view_menu->insertItem( "Previous &30 Minutes", this, SLOT(view30Minutes()) );
@@ -165,7 +171,7 @@
    m_view_menu->setItemChecked( m_view_menu->idAt(0), true );
 
    m_view_menu->insertSeparator();
-   m_exp_rate_menu = new QPopupMenu( this );
+   m_exp_rate_menu = new Q3PopupMenu( this );
    m_exp_rate_menu->insertItem( "per &minute", this, SLOT(viewRatePerMinute()) );
    m_exp_rate_menu->insertItem( "per &hour", this, SLOT(viewRatePerHour()) );
    m_exp_rate_menu->setItemChecked( m_exp_rate_menu->idAt(0), true );
@@ -175,7 +181,7 @@
    m_view_menu->insertItem( "Clear Kills", this, SLOT(viewClear()) );
 
    m_view_menu->insertSeparator();
-   m_ZEM_menu = new QPopupMenu( this );
+   m_ZEM_menu = new Q3PopupMenu( this );
    m_ZEM_menu->insertItem( "Calculated Value", this, SLOT(viewZEMcalculated()) );
    m_ZEM_menu->insertItem( "Raw Value", this, SLOT(viewZEMraw()) );
    m_ZEM_menu->insertItem( "Percent Bonus", this, SLOT(viewZEMpercent()) );
@@ -183,14 +189,14 @@
    m_view_menu->insertItem( "ZEM View Options", m_ZEM_menu );
    m_view_menu->insertItem( "Calculate ZEM on next kill", this, SLOT(calcZEMNextKill()) );
 
-   m_layout = new QVBoxLayout(boxLayout());
+   m_layout = new Q3VBoxLayout(boxLayout());
 
    m_menu_bar = new QMenuBar( this );
    m_menu_bar->insertItem( "&View", m_view_menu );
    //m_layout->addSpacing( m_menu_bar->height() + 5 );
    m_layout->addWidget(m_menu_bar);
 
-   QGroupBox *listGBox = new QVGroupBox( "Experience Log", this );
+   Q3GroupBox *listGBox = new Q3VGroupBox( "Experience Log", this );
    m_layout->addWidget( listGBox );
 
    m_exp_listview = new SEQListView(preferenceName(), listGBox);
@@ -208,10 +214,10 @@
    m_exp_listview->setMinimumSize( m_exp_listview->sizeHint().width(),
       200 );
 
-   QGroupBox *statsGBox = new QVGroupBox( "Statistics", this );
+   Q3GroupBox *statsGBox = new Q3VGroupBox( "Statistics", this );
    m_layout->addWidget( statsGBox );
    
-   QGrid *statsGrid = new QGrid( 4, statsGBox );
+   Q3Grid *statsGrid = new Q3Grid( 4, statsGBox );
 
    new QLabel( "Total Experience Received:",
       statsGrid );
@@ -243,8 +249,8 @@
    m_time_to_level = new QLabel( statsGrid );
 
    // ewww, why can't we just get it from QGrid? :(
-   ((QGridLayout *)statsGrid->layout())->setColStretch( 1, 1 );
-   ((QGridLayout *)statsGrid->layout())->setColStretch( 3, 1 );
+   ((Q3GridLayout *)statsGrid->layout())->setColStretch( 1, 1 );
+   ((Q3GridLayout *)statsGrid->layout())->setColStretch( 3, 1 );
    statsGrid->layout()->setSpacing( 5 );
 
    updateAverage( );
@@ -338,8 +344,8 @@
    strftime(s_time, 64, "%m/%d %H:%M:%S", localtime( &timev ));
 
    /* Update suggested by Shag */
-   QListViewItem *new_exp_entry = 
-     new QListViewItem( m_exp_listview, s_time, s_mob_name, 
+   Q3ListViewItem *new_exp_entry = 
+     new Q3ListViewItem( m_exp_listview, s_time, s_mob_name, 
 			s_mob_level, s_xp_value, s_xp_valueZEM,
 			s_xp_valuep, s_xp_valueg, s_xp_gained );
 

Modified: showeq/branches/qt3to4_Z/src/experiencelog.h
===================================================================
--- showeq/branches/qt3to4_Z/src/experiencelog.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/experiencelog.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -14,11 +14,16 @@
 # include <qobject.h>
 # include <qwidget.h>
 # include <qlist.h>
-# include <qlistview.h>
+# include <q3listview.h>
 # include <qcombobox.h>
 # include <qlabel.h>
 # include <qlayout.h>
 # include <qmenubar.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3VBoxLayout>
+#include <Q3PopupMenu>
+#include <Q3PtrList>
 
 #include <stdint.h>
 # include <sys/time.h>
@@ -114,7 +119,7 @@
    GroupMgr* m_group;
    ZoneMgr* m_zoneMgr;
 
-   QVBoxLayout *m_layout;
+   Q3VBoxLayout *m_layout;
 
    SEQListView *m_exp_listview;
 
@@ -123,10 +128,10 @@
       *m_experience_remaining, *m_play_time,
       *m_experience_rate, *m_kills_to_level, *m_time_to_level;
 
-   QPtrList<ExperienceRecord> m_exp_list;
+   Q3PtrList<ExperienceRecord> m_exp_list;
 
    QMenuBar *m_menu_bar;
-   QPopupMenu *m_view_menu, *m_exp_rate_menu, *m_ZEM_menu;
+   Q3PopupMenu *m_view_menu, *m_exp_rate_menu, *m_ZEM_menu;
 
    int m_timeframe;
    int m_ratio;

Modified: showeq/branches/qt3to4_Z/src/filter.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/filter.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/filter.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -197,7 +197,7 @@
 {
 }
 
-bool FilterItem::save(QString& indent, QTextStream& out)
+bool FilterItem::save(QString& indent, Q3TextStream& out)
 {
   out << indent << "<oldfilter>";
 
@@ -289,7 +289,7 @@
 //
 // parses the filter file and builds filter list
 //
-bool Filter::save(QString& indent, QTextStream& out)
+bool Filter::save(QString& indent, Q3TextStream& out)
 {
   FilterItem *re;
 
@@ -512,17 +512,17 @@
   QFile file(filename);
 
   // open the file for write only
-  if (!file.open(IO_WriteOnly))
+  if (!file.open(QIODevice::WriteOnly))
     return false;
 
   // create a QTextStream object on the QFile object
-  QTextStream out(&file);
+  Q3TextStream out(&file);
   
   // set the output encoding to be UTF8
-  out.setEncoding(QTextStream::UnicodeUTF8);
+  out.setEncoding(Q3TextStream::UnicodeUTF8);
 
   // set the number output to be left justified decimal
-  out.setf(QTextStream::dec | QTextStream::left);
+  out.setf(Q3TextStream::dec | Q3TextStream::left);
 
   // print document header
   out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl

Modified: showeq/branches/qt3to4_Z/src/filter.h
===================================================================
--- showeq/branches/qt3to4_Z/src/filter.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/filter.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -20,7 +20,7 @@
 #include <qlist.h>
 #include <qregexp.h>
 #include <qxml.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 
 #include <map>
 
@@ -47,7 +47,7 @@
   FilterItem(const QString& filterPattern, bool caseSensitive, 
 	     uint8_t minLevel, uint8_t maxLevel);
   ~FilterItem(void);
-   bool save(QString& indent, QTextStream& out);
+   bool save(QString& indent, Q3TextStream& out);
 
   bool isFiltered(const QString& filterString, uint8_t level) const;
 
@@ -76,7 +76,7 @@
    Filter(bool caseSensitive = 0);
    ~Filter();
 
-   bool save(QString& indent, QTextStream& out);
+   bool save(QString& indent, Q3TextStream& out);
    bool isFiltered(const QString& filterString, uint8_t level);
    bool addFilter(const QString& filterPattern);
    bool addFilter(const QString& filterPattern, uint8_t minLevel, uint8_t maxLevel);

Modified: showeq/branches/qt3to4_Z/src/group.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/group.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/group.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -268,7 +268,7 @@
   }
 }
 
-void GroupMgr::dumpInfo(QTextStream& out)
+void GroupMgr::dumpInfo(Q3TextStream& out)
 {
   // dump general group manager information
   out << "[GroupMgr]" << endl;

Modified: showeq/branches/qt3to4_Z/src/group.h
===================================================================
--- showeq/branches/qt3to4_Z/src/group.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/group.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -50,7 +50,7 @@
   void killSpawn(const Item* item);
 
   // dump debug info
-  void dumpInfo(QTextStream& out);
+  void dumpInfo(Q3TextStream& out);
 
  signals:
   void added(const QString& name, const Spawn* mem);

Modified: showeq/branches/qt3to4_Z/src/guild.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guild.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/guild.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -20,7 +20,7 @@
 
 #include <qfile.h>
 #include <qdatastream.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 
 GuildMgr::GuildMgr(QString fn, QObject* parent, const char* name)
   : QObject(parent, name)
@@ -62,7 +62,7 @@
      }
   }
 
-  if(!guildsfile.open(IO_WriteOnly))
+  if(!guildsfile.open(QIODevice::WriteOnly))
     seqWarn("GuildMgr: Could not open %s for writing, unable to replace with server data!",
              guildsFileName.latin1());
 
@@ -79,7 +79,7 @@
   QFile guildsfile(guildsFileName);
 
   m_guildMap.clear();
-  if (guildsfile.open(IO_ReadOnly))
+  if (guildsfile.open(QIODevice::ReadOnly))
   {
     worldGuildListStruct tmp;
      if (guildsfile.size() != sizeof(tmp.guilds))
@@ -110,7 +110,7 @@
 void GuildMgr::guildList2text(QString fn)
 {
   QFile guildsfile(fn);
-  QTextStream guildtext(&guildsfile);
+  Q3TextStream guildtext(&guildsfile);
 
     if (guildsfile.exists()) {
          if (!guildsfile.remove()) {
@@ -120,7 +120,7 @@
         }
    }
 
-   if (!guildsfile.open(IO_WriteOnly)) {
+   if (!guildsfile.open(QIODevice::WriteOnly)) {
      seqWarn("GuildMgr: Could not open %s for writing, unable to process request!",
               fn.latin1());
       return;

Modified: showeq/branches/qt3to4_Z/src/guildlist.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guildlist.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/guildlist.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -18,17 +18,20 @@
 #include <qpainter.h>
 #include <qfontdialog.h>
 #include <qinputdialog.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 //----------------------------------------------------------------------
 // GuildListItem
-GuildListItem::GuildListItem(QListView* parent,
+GuildListItem::GuildListItem(Q3ListView* parent,
 			     const GuildMember* member, 
 			     const GuildShell* guildShell)
-  : QListViewItem(parent),
+  : Q3ListViewItem(parent),
     m_member(member)
 {
   update(guildShell);
@@ -51,10 +54,10 @@
 
   p->setFont(font);
 
-  QListViewItem::paintCell( p, cg, column, width, alignment );
+  Q3ListViewItem::paintCell( p, cg, column, width, alignment );
 }
 
-int GuildListItem::compare(QListViewItem *o, int col, bool ascending) const
+int GuildListItem::compare(Q3ListViewItem *o, int col, bool ascending) const
 {
   if (!m_member)
     return -1;
@@ -91,7 +94,7 @@
     else
       return m_member->lastOn() > otherMember->lastOn() ? 1 : -1;
   default:
-    return QListViewItem::compare(o, col, ascending);
+    return Q3ListViewItem::compare(o, col, ascending);
   }
 }
 
@@ -151,8 +154,8 @@
 
   m_showAlts = pSEQPrefs->getPrefBool("ShowAlts", preferenceName(), true);
 
-  QBoxLayout* vLayout = new QVBoxLayout(boxLayout());
-  QHBoxLayout* hLayout= new QHBoxLayout(vLayout);
+  Q3BoxLayout* vLayout = new Q3VBoxLayout(boxLayout());
+  Q3HBoxLayout* hLayout= new Q3HBoxLayout(vLayout);
 
   // Guild Name
   m_guildName = new QLabel("Guild", this);
@@ -210,13 +213,13 @@
 {
 }
 
-QPopupMenu* GuildListWindow::menu()
+Q3PopupMenu* GuildListWindow::menu()
 {
   if (m_menu)
     return m_menu;
 
-  m_menu = new QPopupMenu;
-  QPopupMenu* guildListColMenu = new QPopupMenu;
+  m_menu = new Q3PopupMenu;
+  Q3PopupMenu* guildListColMenu = new Q3PopupMenu;
   m_menu->insertItem( "Show &Column", guildListColMenu);
   guildListColMenu->setCheckable(true);
   m_id_guildList_Cols[tGuildListColName] = 

Modified: showeq/branches/qt3to4_Z/src/guildlist.h
===================================================================
--- showeq/branches/qt3to4_Z/src/guildlist.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/guildlist.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -20,9 +20,12 @@
 #include "seqwindow.h"
 #include "seqlistview.h" 
 
-#include <qlistview.h>
-#include <qptrdict.h>
+#include <q3listview.h>
+#include <q3ptrdict.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3PopupMenu>
 
 //----------------------------------------------------------------------
 // forward declarations
@@ -33,7 +36,7 @@
 
 class QLabel;
 class QLineEdit;
-class QPopupMenu;
+class Q3PopupMenu;
 
 //--------------------------------------------------
 // constants
@@ -50,10 +53,10 @@
 
 //----------------------------------------------------------------------
 // GuildListItem
-class GuildListItem : public QListViewItem
+class GuildListItem : public Q3ListViewItem
 {
  public:
-  GuildListItem(QListView* parent,
+  GuildListItem(Q3ListView* parent,
 		const GuildMember* member, 
 		const GuildShell* guildShell);
   virtual ~GuildListItem();
@@ -61,7 +64,7 @@
    virtual void paintCell( QPainter *p, const QColorGroup &cg,
                            int column, int width, int alignment );
 
-   virtual int compare(QListViewItem *i, int col, bool ascending) const;
+   virtual int compare(Q3ListViewItem *i, int col, bool ascending) const;
 
    void update(const GuildShell* guildShell);
 
@@ -85,7 +88,7 @@
 		  QWidget* parent = 0, const char* name = 0);
   ~GuildListWindow();
 
-  virtual QPopupMenu* menu();
+  virtual Q3PopupMenu* menu();
 
  public slots: 
   void cleared();
@@ -113,8 +116,8 @@
   QLabel* m_guildName;
   QLabel* m_guildTotals;
   SEQListView* m_guildList;
-  QPtrDict<GuildListItem> m_guildListItemDict;
-  QPopupMenu* m_menu;
+  Q3PtrDict<GuildListItem> m_guildListItemDict;
+  Q3PopupMenu* m_menu;
   int m_id_guildList_Cols[tGuildListColMaxCols];
 
   uint32_t m_membersOn;

Modified: showeq/branches/qt3to4_Z/src/guildshell.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/guildshell.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/guildshell.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -174,7 +174,7 @@
     return m_zoneMgr->zoneNameFromID(zoneid);
 }
 
-void GuildShell::dumpMembers(QTextStream& out)
+void GuildShell::dumpMembers(Q3TextStream& out)
 {
   QDateTime dt;
   GuildMemberDictIterator it(m_members);

Modified: showeq/branches/qt3to4_Z/src/guildshell.h
===================================================================
--- showeq/branches/qt3to4_Z/src/guildshell.h	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/guildshell.h	2007-02-03 14:32:01 UTC (rev 666)
@@ -16,11 +16,11 @@
 
 #include <qstring.h>
 #include <qobject.h>
-#include <qdict.h>
+#include <q3dict.h>
 
 //----------------------------------------------------------------------
 // forward declarations
-class QTextStream;
+class Q3TextStream;
 
 class NetStream;
 class ZoneMgr;
@@ -73,8 +73,8 @@
 
 //----------------------------------------------------------------------
 // GuildMemberDict
-typedef QDict<GuildMember> GuildMemberDict;
-typedef QDictIterator<GuildMember> GuildMemberDictIterator;
+typedef Q3Dict<GuildMember> GuildMemberDict;
+typedef Q3DictIterator<GuildMember> GuildMemberDictIterator;
 
 //----------------------------------------------------------------------
 // GuildShell
@@ -87,7 +87,7 @@
   const GuildMemberDict& members() { return m_members; }
   size_t maxNameLength() { return m_maxNameLength; }
 
-  void dumpMembers(QTextStream& out);
+  void dumpMembers(Q3TextStream& out);
   
   QString zoneString(uint16_t zoneid) const;
 

Modified: showeq/branches/qt3to4_Z/src/interface.cpp
===================================================================
--- showeq/branches/qt3to4_Z/src/interface.cpp	2007-02-03 03:55:22 UTC (rev 665)
+++ showeq/branches/qt3to4_Z/src/interface.cpp	2007-02-03 14:32:01 UTC (rev 666)
@@ -63,26 +63,29 @@
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <qvaluelist.h>
-#include <qvaluevector.h>
+#include <q3valuelist.h>
+#include <q3valuevector.h>
 #include <qstatusbar.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
-#include <qfiledialog.h>
-#include <qaccel.h>
+#include <q3filedialog.h>
+#include <q3accel.h>
 #include <qfileinfo.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qinputdialog.h>
 #include <qfontdialog.h>
 #include <qcolordialog.h>
-#include <qdockarea.h>
+#include <q3dockarea.h>
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmotifstyle.h>
 #include <qcdestyle.h>
 #include <qsgistyle.h>
+//Added by qt3to4:
+#include <Q3PtrList>
+#include <Q3PopupMenu>
 
 // this define is used to diagnose the order with which zone packets are rcvd
 #define ZONE_ORDER_DIAG
@@ -90,7 +93,7 @@
 /* The main interface widget */
 EQInterface::EQInterface(DataLocationMgr* dlm, 
 			 QWidget * parent, const char *name) 
-  : QMainWindow (parent, name),
+  : Q3MainWindow (parent, name),
     m_player(0),
     m_dataLocationMgr(dlm),
     m_mapMgr(0),
@@ -348,7 +351,7 @@
    section = "Interface";
 
    // create window menu
-   m_windowMenu = new QPopupMenu;
+   m_windowMenu = new Q3PopupMenu;
 
    // Initialize the experience window;
    m_expWindow = new ExperienceWindow(m_dataLocationMgr, m_player, m_groupMgr,
@@ -356,7 +359,7 @@
    setDockEnabled(m_expWindow, 
 		  pSEQPrefs->getPrefBool("DockableExperienceWindow",
 					 section, false));
-   Dock edge = (Dock)pSEQPrefs->getPrefInt("Dock", 
+   Dock edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 					   m_expWindow->preferenceName(),
 					   DockUnmanaged);
    addDockWindow(m_expWindow, edge, false);
@@ -379,7 +382,7 @@
    setDockEnabled(m_combatWindow, 
 		  pSEQPrefs->getPrefBool("DockableCombatWindow",
 					 section, false));
-   edge = (Dock)pSEQPrefs->getPrefInt("Dock", 
+   edge = (Qt::ToolBarDock)pSEQPrefs->getPrefInt("Dock", 
 				      m_combatWindow->preferenceName(),
 				      DockUnmanaged);
    addDockWindow(m_combatWindow, edge, false);
@@ -514,7 +517,7 @@
 
    // File Menu
    //pFileMenu = new QPopupMenu;
-   QPopupMenu* pFileMenu = new QPopupMenu;
+   Q3PopupMenu* pFileMenu = new Q3PopupMenu;
    menuBar()->insertItem("&File", pFileMenu);
    pFileMenu->insertItem("&Save Preferences", this, SLOT(savePrefs()), CTRL+Key_S);
    pFileMenu->insertItem("Open &Map", m_mapMgr, SLOT(loadMap()), Key_F1);
@@ -539,7 +542,7 @@
    pFileMenu->insertItem("&Quit", qApp, SLOT(quit()));
 
    // View menu
-   QPopupMenu* pViewMenu = new QPopupMenu;
+   Q3PopupMenu* pViewMenu = new Q3PopupMenu;
    menuBar()->insertItem("&View", pViewMenu);
    pViewMenu->setCheckable(true);
    m_id_view_ExpWindow = pViewMenu->insertItem("Experience Window", this, SLOT(toggle_view_ExpWindow()));
@@ -554,7 +557,7 @@
    m_id_view_Compass = pViewMenu->insertItem("Compass", this, SLOT(toggle_view_Compass()));
    menuBar()->setItemChecked(m_id_view_PlayerStats, (m_statList != 0));
 
-   QPopupMenu* subMenu = new QPopupMenu;
+   Q3PopupMenu* subMenu = new Q3PopupMenu;
    for (int i = 0; i < maxNumMaps; i++)
    {     
         QString mapName = "Map ";
@@ -566,7 +569,7 @@
    }
    pViewMenu->insertItem("Maps", subMenu);
 
-   subMenu = new QPopupMenu;
+   subMenu = new Q3PopupMenu;
    QString messageWindowName;
    for (int i = 0; i < maxNumMessageWindows; i++)
    {     
@@ -590,7 +593,7 @@
    pViewMenu->insertSeparator(-1);
 
    // View -> PlayerStats
-   m_statWinMenu = new QPopupMenu;
+   m_statWinMenu = new Q3PopupMenu;
    m_id_view_PlayerStats_Options = pViewMenu->insertItem( "&Player Stats", m_statWinMenu);
    m_statWinMenu->setCheckable(TRUE);
 
@@ -668,7 +671,7 @@
    connect (m_statWinMenu, SIGNAL(activated(int)), this, SLOT(toggle_view_StatWin(int)));
 
    // View -> PlayerSkills
-   m_skillWinMenu = new QPopupMenu;
+   m_skillWinMenu = new Q3PopupMenu;
    m_id_view_PlayerSkills_Options = pViewMenu->insertItem( "Player &Skills", m_skillWinMenu);
    pViewMenu->setItemEnabled(m_id_view_PlayerSkills_Options, (m_skillList != 0));
    m_skillWinMenu->setCheckable(TRUE);
@@ -679,7 +682,7 @@
    connect (m_skillWinMenu, SIGNAL(activated(int)), this, SLOT(toggle_view_SkillWin(int)));
 
    // View -> SpawnList
-    m_spawnListMenu = new QPopupMenu;
+    m_spawnListMenu = new Q3PopupMenu;
     m_id_view_SpawnList_Options = pViewMenu->insertItem( "Spawn &List", m_spawnListMenu);
     pViewMenu->setItemEnabled(m_id_view_SpawnList_Options, (m_spawnList != 0));
     m_spawnListMenu->setCheckable(TRUE);
@@ -732,7 +735,7 @@
 
    int x;
    // View -> DockedWin
-   m_dockedWinMenu = new QPopupMenu;
+   m_dockedWinMenu = new Q3PopupMenu;
    pViewMenu->insertItem( "&Docked", m_dockedWinMenu);
    m_dockedWinMenu->setCheckable(true);
     
@@ -779,7 +782,7 @@
    connect (m_dockedWinMenu, SIGNAL(activated(int)), this, SLOT(toggle_view_DockedWin(int)));
 
    // View -> DockableWin
-   m_dockableWinMenu = new QPopupMenu;
+   m_dockableWinMenu = new Q3PopupMenu;
    pViewMenu->insertItem( "&Dockable", m_dockableWinMenu);
    m_dockableWinMenu->setCheckable(true);
     
@@ -850,7 +853,7 @@
 							    section, true));
 
    // insert Map docking options 
-   subMenu = new QPopupMenu;
+   subMenu = new Q3PopupMenu;
    for (int i = 0; i < maxNumMaps; i++)
    {     
         QString mapName = "Map ";
@@ -871,7 +874,7 @@
    m_dockableWinMenu->insertItem("Maps", subMenu);
 
    // insert Message Window docking options 
-   subMenu = new QPopupMenu;
+   subMenu = new Q3PopupMenu;
    QString messagePrefName = "DockableMessageWindow";
    for (int i = 0; i < maxNumMessageWindows; i++)
    {     
@@ -897,7 +900,7 @@
 
 
    // Options Menu
-   QPopupMenu* pOptMenu = new QPopupMenu;
+   Q3PopupMenu* pOptMenu = new Q3PopupMenu;
    menuBar()->insertItem("&Options", pOptMenu);
    pOptMenu->setCheckable(TRUE);
    m_id_opt_Fast     = pOptMenu->insertItem("Fast Machine?", this, SLOT(toggle_opt_Fast()));
@@ -924,7 +927,7 @@
 			    this, SLOT(toggle_opt_WalkPathRecord(int)));
    menuBar()->setItemChecked (x, showeq_params->walkpathrecord);
 
-   subMenu = new QPopupMenu;
+   subMenu = new Q3PopupMenu;
    QSpinBox* walkPathLengthSpinBox = new QSpinBox(0, 8192, 1, subMenu);
    walkPathLengthSpinBox->setValue(showeq_params->walkpathlength);
    connect(walkPathLengthSpinBox, SIGNAL(valueChanged(int)),
@@ -942,7 +945,7 @@
    menuBar()->setItemChecked (m_id_opt_PvPDeity, showeq_params->deitypvp);
 
    // SaveState SubMenu
-   QPopupMenu* pSaveStateMenu = new QPopupMenu;
+   Q3PopupMenu* pSaveStateMenu = new Q3PopupMenu;
    pOptMenu->insertItem("&Save State", pSaveStateMenu);
    pSaveStateMenu->setCheckable(true);
    x = pSaveStateMenu->insertItem("&Player", this, 
@@ -958,7 +961,7 @@
 			      SLOT(set_opt_save_BaseFilename(void)));
 
    pSaveStateMenu->insertSeparator(-1);
-   subMenu = new QPopupMenu;
+   subMenu = new Q3PopupMenu;
    QSpinBox* saveFrequencySpinBox = new QSpinBox(1, 320, 1, subMenu);
    saveFrequencySpinBox->setValue(showeq_params->saveSpawnsFrequency / 1000);
    connect(saveFrequencySpinBox, SIGNAL(valueChanged(int)),
@@ -971,7 +974,7 @@
 			this, SLOT(opt_clearChannelMsgs(int)));
 
    // Con Color base menu
-   QPopupMenu* conColorBaseMenu = new QPopupMenu;
+   Q3PopupMenu* conColorBaseMenu = new Q3PopupMenu;
    x = conColorBaseMenu->insertItem("Gray Spawn Base...");
    conColorBaseMenu->setItemParameter(x, tGraySpawn);
    x = conColorBaseMenu->insertItem("Green Spawn Base...");
@@ -993,7 +996,7 @@
    pOptMenu->insertItem("Con &Colors", conColorBaseMenu);
 
    // Network Menu
-   m_netMenu = new QPopupMenu;
+   m_netMenu = new Q3PopupMenu;
    menuBar()->insertItem("&Network", m_netMenu);
    m_netMenu->insertItem("Monitor &Next EQ Client Seen", this, SLOT(set_net_monitor_next_client()));
    m_netMenu->insertItem("Monitor EQ Client &IP Address...", this, SLOT(set_net_client_IP_address()));
@@ -1007,7 +1010,7 @@
    m_netMenu->insertSeparator(-1);
 
    // Log menu
-   QPopupMenu* pLogMenu = new QPopupMenu;
+   Q3PopupMenu* pLogMenu = new Q3PopupMenu;
    m_netMenu->insertItem("Lo&g", pLogMenu);
    pLogMenu->setCheckable(true);
    m_id_log_AllPackets  = pLogMenu->insertItem("All Packets", this, SLOT(toggle_log_AllPackets()), Key_F5);
@@ -1032,10 +1035,10 @@
 						     false));
 
    // OpCode Monitor
-   QPopupMenu* pOpCodeMenu = new QPopupMenu;
+   Q3PopupMenu* pOpCodeMenu = new Q3PopupMenu;
    m_netMenu->insertItem("OpCode Monitor", pOpCodeMenu);
    x = pOpCodeMenu->insertItem("&OpCode Monitoring", this,
-			      SLOT(toggle_opcode_monitoring(int)), CTRL+ALT+Key_O);
+			      SLOT(toggle_opcode_monitoring(int)), Qt::CTRL+Qt::ALT+Qt::Key_O);
    
    pOpCodeMenu->setItemChecked(x, (m_opcodeMonitorLog != 0));
    pOpCodeMenu->insertItem("&Reload Monitored OpCode List..", this,
@@ -1058,8 +1061,8 @@
    section = "Interface";
 
    // Advanced menu
-   subMenu = new QPopupMenu;
-   QPopupMenu* subSubMenu = new QPopupMenu;
+   subMenu = new Q3PopupMenu;
+   Q3PopupMenu* subSubMenu = new Q3PopupMenu;
    QSpinBox* arqSeqGiveUpSpinBox = new QSpinBox(32, 1024, 8, subSubMenu);
    arqSeqGiveUpSpinBox->setValue(m_packet->arqSeqGiveUp());
    connect(arqSeqGiveUpSpinBox, SIGNAL(valueChanged(int)),
@@ -1070,14 +1073,14 @@
    m_netMenu->insertItem("Advanced", subMenu);
 
    // Character Menu 
-   m_charMenu = new QPopupMenu;
+   m_charMenu = new Q3PopupMenu;
    menuBar()->insertItem("&Character", m_charMenu);
    int yx = m_charMenu->insertItem("Use Auto Detected Settings", this, 
 				   SLOT(toggleAutoDetectPlayerSettings(int)));
    m_charMenu->setItemChecked(yx, m_player->useAutoDetectedSettings());
 
    // Character -> Level
-   m_charLevelMenu = new QPopupMenu;
+   m_charLevelMenu = new Q3PopupMenu;
    m_charMenu->insertItem("Choose &Level", m_charLevelMenu);
    m_levelSpinBox = new QSpinBox(1, 75, 1, this, "m_levelSpinBox");
    m_charLevelMenu->insertItem( m_levelSpinBox );
@@ -1088,7 +1091,7 @@
    m_levelSpinBox->setValue(m_player->defaultLevel());
 
    // Character -> Class
-   m_charClassMenu = new QPopupMenu;
+   m_charClassMenu = new Q3PopupMenu;
    m_charMenu->insertItem("Choose &Class", m_charClassMenu);
    for( int i = 0; i < PLAYER_CLASSES; i++)
    {
@@ -1100,7 +1103,7 @@
    connect (m_charClassMenu, SIGNAL(activated(int)), this, SLOT(SetDefaultCharacterClass(int)));
 
    // Character -> Race
-   m_charRaceMenu = new QPopupMenu;
+   m_charRaceMenu = new Q3PopupMenu;
    m_charMenu->insertItem("Choose &Race", m_charRaceMenu);
    for( int i = 0; i < PLAYER_RACES; i++)
    {
@@ -1120,7 +1123,7 @@
    connect (m_charRaceMenu, SIGNAL(activated(int)), this, SLOT(SetDefaultCharacterRace(int)));
 
    // Filters Menu
-   QPopupMenu* filterMenu = new QPopupMenu;
+   Q3PopupMenu* filterMenu = new Q3PopupMenu;
    menuBar()->insertItem( "Fi&lters" , filterMenu);
    filterMenu->setCheckable(true);
 
@@ -1145,7 +1148,7 @@
    filterMenu->setItemChecked(x, m_filterNotifications->useCommands());
 
    // Filter -> Log
-   QPopupMenu* filterLogMenu = new QPopupMenu;
+   Q3PopupMenu* filterLogMenu = new Q3PopupMenu;
    filterLogMenu->setCheckable(true);
    filterMenu->insertItem("&Log", filterLogMenu);
    x = filterLogMenu->insertItem( "Alerts");
@@ -1167,7 +1170,7 @@
 	   this, SLOT(toggle_filter_Log(int)));
 
    // Filter -> Commands
-   QPopupMenu* filterCmdMenu = new QPopupMenu;
+   Q3PopupMenu* filterCmdMenu = new Q3PopupMenu;
    filterMenu->insertItem("&Audio Commands", filterCmdMenu);
    x = filterCmdMenu->insertItem( "Spawn...");
    filterCmdMenu->setItemParameter(x, 1);
@@ -1187,14 +1190,14 @@
 	   this, SLOT(set_filter_AudioCommand(int)));
 
    // Interface Menu
-   QPopupMenu* pInterfaceMenu = new QPopupMenu;
+   Q3PopupMenu* pInterfaceMenu = new Q3PopupMenu;
    menuBar()->insertItem( "&Interface" , pInterfaceMenu);
 
    pInterfaceMenu->insertItem("Hide MenuBar", this, SLOT(toggle_view_menubar()));
 
    // Interface -> Style
    //pStyleMenu = new QPopupMenu;
-   QPopupMenu* pStyleMenu = new QPopupMenu;
+   Q3PopupMenu* pStyleMenu = new Q3PopupMenu;
    pInterfaceMenu->insertItem( "&Style", pStyleMenu);
    pStyleMenu->setCheckable(TRUE);
    x = pStyleMenu->insertItem( "Platinum (Macintosh)");
@@ -1220,7 +1223,7 @@
    setTheme(pSEQPrefs->getPrefInt("Theme", section, 2));
 
    // Interface -> Status Bar
-   QPopupMenu* statusBarMenu = new QPopupMenu;
+   Q3PopupMenu* statusBarMenu = new Q3PopupMenu;
    statusBarMenu->setCheckable(true);
    pInterfaceMenu->insertItem("&Status Bar", statusBarMenu);
    statusBarMenu->insertItem("Show/Hide", 
@@ -1266,10 +1269,10 @@
    connect (statusBarMenu, SIGNAL(activated(int)), 
 	    this, SLOT(toggle_main_statusbar_Window(int)));
 
-   m_terminalMenu = new QPopupMenu;
+   m_terminalMenu = new Q3PopupMenu;
    pInterfaceMenu->insertItem("&Terminal", m_terminalMenu);
 
-   m_terminalTypeFilterMenu = new QPopupMenu;
+   m_terminalTypeFilterMenu = new Q3PopupMenu;
    m_terminalMenu->insertItem("MessageTypeFilter", m_terminalTypeFilterMenu);
    m_terminalTypeFilterMenu->insertItem("&Enable All", 
 					this, SLOT(enableAllTypeFilters()), 0, 64);
@@ -1296,7 +1299,7 @@
    connect(m_terminalTypeFilterMenu, SIGNAL(activated(int)),
 	   this, SLOT(toggleTypeFilter(int)));
 
-  m_terminalShowUserFilterMenu = new QPopupMenu;
+  m_terminalShowUserFilterMenu = new Q3PopupMenu;
   m_terminalMenu->insertItem("User Message Filter - &Show", m_terminalShowUserFilterMenu);
 
   m_terminalShowUserFilterMenu->insertItem("&Enable All", 
@@ -1305,7 +1308,7 @@
 			       this, SLOT(disableAllShowUserFilters()), 0, 67);
   m_terminalShowUserFilterMenu->insertSeparator(-1);
 
-  m_terminalHideUserFilterMenu = new QPopupMenu;
+  m_terminalHideUserFilterMenu = new Q3PopupMenu;
   m_terminalMenu->insertItem("User Message Filter - &Hide", m_terminalHideUserFilterMenu);
 
   m_terminalHideUserFilterMenu->insertItem("&Enable All", 
@@ -1364,7 +1367,7 @@
    // have to be manually placed in the right positions.
 
    // Interface -> WindowCaption
-   m_windowCaptionMenu = new QPopupMenu;
+   m_windowCaptionMenu = new Q3PopupMenu;
    m_windowMenu->insertItem( "Window &Caption", m_windowCaptionMenu, -1, 0);
    
    x = m_windowCaptionMenu->insertItem("&Main Window...");
@@ -1415,7 +1418,7 @@
 	    this, SLOT(set_main_WindowCaption(int)));
 
    // Interface -> Window Font
-   QPopupMenu* windowFontMenu = new QPopupMenu;
+   Q3PopupMenu* windowFontMenu = new Q3PopupMenu;
    m_windowMenu->insertItem( "&Font", windowFontMenu, -1, 1);
     
    windowFontMenu->insertItem( "&Application Default...", 
@@ -1487,7 +1490,7 @@
    m_windowMenu->insertSeparator(4);
 
    // Debug menu
-   QPopupMenu* pDebugMenu = new QPopupMenu;
+   Q3PopupMenu* pDebugMenu = new Q3PopupMenu;
    menuBar()->insertItem("&Debug", pDebugMenu);
    pDebugMenu->insertItem("List I&nterface", this, SLOT(listInterfaceInfo()));
    pDebugMenu->insertItem("List S&pawns", this, SLOT(listSpawns()), ALT+CTRL+Key_P);
@@ -2130,7 +2133,7 @@
    }
    show();
 
-   QAccel *accel = new QAccel(this);
+   Q3Accel *accel = new Q3Accel(this);
    accel->connectItem( accel->insertItem(CTRL+ALT+Key_S), this, SLOT(toggle_view_statusbar()));
    accel->connectItem( accel->insertItem(CTRL+ALT+Key_T), this, SLOT(toggle_view_menubar()));
 
@@ -2139,7 +2142,7 @@
 						QString());
    if (!dockPrefs.isEmpty())
    {
-     QTextStream ts(&dockPrefs, IO_ReadOnly);
+     Q3TextStream ts(&dockPrefs, QIODevice::ReadOnly);
      ts >> *this;
    }
 
@@ -2147,7 +2150,7 @@
    // TODO: Add % replacement values and a signal to update, for ip address currently
    // TODO: being monitored.
 
-   QMainWindow::setCaption(pSEQPrefs->getPrefString("Caption", section, 
+   Q3MainWindow::setCaption(pSEQPrefs->getPrefString("Caption", section, 
 						    "ShowEQ - Main (ctrl+alt+t to toggle menubar)"));
 
    // load the format strings for display
@@ -2818,7 +2821,7 @@
   QFileInfo fileInfo = m_dataLocationMgr->findExistingFile(".", formatFile);
 
   QString newFormatFile = 
-    QFileDialog::getOpenFileName(fileInfo.absFilePath(), "*.txt", 
+    Q3FileDialog::getOpenFileName(fileInfo.absFilePath(), "*.txt", 
 				 this, "FormatFile", "Select Format File");
 
   // if the newFormatFile name is not empty, then the user selected a file
@@ -2840,7 +2843,7 @@
   QFileInfo fileInfo = m_dataLocationMgr->findExistingFile(".", spellsFile);
 
   QString newSpellsFile = 
-    QFileDialog::getOpenFileName(fileInfo.absFilePath(), "*.txt", 
+    Q3FileDialog::getOpenFileName(fileInfo.absFilePath(), "*.txt", 
 				 this, "FormatFile", "Select Format File");
 
   // if the newFormatFile name is not empty, then the user selected a file
@@ -2997,7 +3000,7 @@
      QString tempStr;
 
      QString dockPrefs;
-     QTextStream ts(&dockPrefs, IO_WriteOnly);
+     Q3TextStream ts(&dockPrefs, QIODevice::WriteOnly);
 
      ts << *this;
 
@@ -3020,10 +3023,10 @@
    }
 } // end savePrefs
 
-void EQInterface::saveDockAreaPrefs(QDockArea* a, Dock edge)
+void EQInterface::saveDockAreaPrefs(Q3DockArea* a, Qt::ToolBarDock edge)
 {
-  QPtrList<QDockWindow> l = a->dockWindowList();
-  for (QDockWindow *dw = l.first(); dw; dw = l.next())
+  Q3PtrList<Q3DockWindow> l = a->dockWindowList();
+  for (Q3DockWindow *dw = l.first(); dw; dw = l.next())
   {
     if (dw->inherits("SEQWindow"))
       pSEQPrefs->setPrefInt("Dock", ((SEQWindow*)dw)->preferenceName(), edge);
@@ -3033,7 +3036,7 @@
 
 void EQInterface::setCaption(const QString& text)
 {
-  QMainWindow::setCaption(text);
+  Q3MainWindow::setCaption(text);
 
   pSEQPrefs->setPrefString("Caption", "Interface", caption());
 }
@@ -3055,7 +3058,7 @@
 void
 EQInterface::select_filter_file(void)
 {
-  QString filterFile = QFileDialog::getOpenFileName(m_filterMgr->filterFile(),
+  QString filterFile = Q3FileDialog::getOpenFileName(m_filterMgr->filterFile(),
                                                      QString("ShowEQ Filter Files (*.xml)"),
                                                      0,
                                                      "Select Filter Config..."
@@ -3172,7 +3175,7 @@
   QString outText;
 
   // open the output data stream
-  QTextStream out(&outText, IO_WriteOnly);
+  Q3TextStream out(&outText, QIODevice::WriteOnly);
   
    // dump the spawns 
   m_spawnShell->dumpSpawns(tSpawn, out);
@@ -3188,7 +3191,7 @@
   QString outText;
 
   // open the output data stream
-  QTextStream out(&outText, IO_WriteOnly);
+  Q3TextStream out(&outText, QIODevice::WriteOnly);
 
   // dump the drops
   m_spawnShell->dumpSpawns(tDrop, out);
@@ -3204,7 +3207,7 @@
   QString outText;
 
   // open the output data stream
-  QTextStream out(&outText, IO_WriteOnly);
+  Q3TextStream out(&outText, QIODevice::WriteOnly);
 
   // dump map managers info
   m_mapMgr->dumpInfo(out);
@@ -3229,7 +3232,7 @@
   QString outText;
 
   // open the output data stream
-  QTextStream out(&outText, IO_WriteOnly);
+  Q3TextStream out(&outText, QIODevice::WriteOnly);
 
   out << "Map window layout info:" << endl;
   out << "-----------------------" << endl;
@@ -3248,7 +3251,7 @@
   QString outText;
 
   // open the output data stream
-  QTextStream out(&outText, IO_WriteOnly);
+  Q3TextStream out(&outText, QIODevice::WriteOnly);
 
   // dump the drops
   m_groupMgr->dumpInfo(out);
@@ -3265,7 +3268,7 @@
   QString outText;
 
   // open the output data stream
-  QTextStream out(&outText, IO_WriteOnly);
+  Q3TextStream out(&outText, QIODevice::WriteOnly);
 
   // dump the drops
   m_guildShell->dumpMembers(out);
@@ -3286,8 +3289,8 @@
 
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
-  file.open(IO_WriteOnly);
-  QTextStream out(&file);
+  file.open(QIODevice::WriteOnly);
+  Q3TextStream out(&file);
   
   // dump the spawns 
   m_spawnShell->dumpSpawns(tSpawn, out);
@@ -3306,8 +3309,8 @@
 
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
-  file.open(IO_WriteOnly);
-  QTextStream out(&file);
+  file.open(QIODevice::WriteOnly);
+  Q3TextStream out(&file);
 
   // dump the drops
   m_spawnShell->dumpSpawns(tDrop, out);
@@ -3327,8 +3330,8 @@
 
   // open the output data stream
   QFile file(logFileInfo.absFilePath());
-  file.open(IO_WriteOnly);
-  QTe...
 
[truncated message content]

[Seq-cvs-commit] SF.net SVN: seq: [665] showeq/branches/qt3to4_Z/

From: <do...@us...> - 2007-02-03 03:55:24

Revision: 665
          http://seq.svn.sourceforge.net/seq/?rev=665&view=rev
Author:   dohpaz
Date:     2007-02-02 19:55:22 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
Create Qt3 to Qt4 porting attempt branch...  
There WILL be dragons here...

Added Paths:
-----------
    showeq/branches/qt3to4_Z/

Copied: showeq/branches/qt3to4_Z (from rev 664, showeq/trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] SF.net SVN: seq: [664] showeq/trunk

From: <do...@us...> - 2007-02-03 03:47:09

Revision: 664
          http://seq.svn.sourceforge.net/seq/?rev=664&view=rev
Author:   dohpaz
Date:     2007-02-02 19:47:08 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
+ Updated version to 5.7.0.1
+ Assorted minor tweaks
+ Initial attempt to build with qmake
+ Fix odd crash in packet handling. 
+ Normalize some data type usage.
+ Remove ItemDB and related utilities from build since they haven't
  worked in a while and would really need a rewrite.  
+ Remove gdbm/db3 requirements
+ Update some copyright info.

Modified Paths:
--------------
    showeq/trunk/ChangeLog
    showeq/trunk/INSTALL
    showeq/trunk/INSTALL.newbies
    showeq/trunk/configure.in
    showeq/trunk/src/Makefile.am
    showeq/trunk/src/bazaarlog.cpp
    showeq/trunk/src/category.cpp
    showeq/trunk/src/combatlog.cpp
    showeq/trunk/src/compass.cpp
    showeq/trunk/src/compass.h
    showeq/trunk/src/compassframe.cpp
    showeq/trunk/src/datetimemgr.cpp
    showeq/trunk/src/editor.cpp
    showeq/trunk/src/experiencelog.cpp
    showeq/trunk/src/filteredspawnlog.cpp
    showeq/trunk/src/filtermgr.cpp
    showeq/trunk/src/filternotifications.cpp
    showeq/trunk/src/group.cpp
    showeq/trunk/src/guild.cpp
    showeq/trunk/src/guildlist.cpp
    showeq/trunk/src/guildshell.cpp
    showeq/trunk/src/interface.cpp
    showeq/trunk/src/interface.h
    showeq/trunk/src/itemdb.cpp
    showeq/trunk/src/logger.cpp
    showeq/trunk/src/main.cpp
    showeq/trunk/src/main.h
    showeq/trunk/src/map.cpp
    showeq/trunk/src/map.h
    showeq/trunk/src/mapcore.cpp
    showeq/trunk/src/mapicon.cpp
    showeq/trunk/src/messagefilter.cpp
    showeq/trunk/src/messagefilterdialog.cpp
    showeq/trunk/src/messages.cpp
    showeq/trunk/src/messageshell.cpp
    showeq/trunk/src/messagewindow.cpp
    showeq/trunk/src/netdiag.cpp
    showeq/trunk/src/packet.cpp
    showeq/trunk/src/packetinfo.cpp
    showeq/trunk/src/packetlog.cpp
    showeq/trunk/src/packetstream.cpp
    showeq/trunk/src/player.cpp
    showeq/trunk/src/seqlistview.cpp
    showeq/trunk/src/seqwindow.cpp
    showeq/trunk/src/skilllist.cpp
    showeq/trunk/src/spawnlist.cpp
    showeq/trunk/src/spawnlist2.cpp
    showeq/trunk/src/spawnlistcommon.cpp
    showeq/trunk/src/spawnlog.cpp
    showeq/trunk/src/spawnmonitor.cpp
    showeq/trunk/src/spawnpointlist.cpp
    showeq/trunk/src/spawnshell.cpp
    showeq/trunk/src/spelllist.cpp
    showeq/trunk/src/spellshell.cpp
    showeq/trunk/src/statlist.cpp
    showeq/trunk/src/terminal.cpp
    showeq/trunk/src/util.cpp
    showeq/trunk/src/xmlpreferences.cpp
    showeq/trunk/src/zonemgr.cpp

Added Paths:
-----------
    showeq/trunk/src/showeq.pro

Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/ChangeLog	2007-02-03 03:47:08 UTC (rev 664)
@@ -1,5 +1,17 @@
 Version: $Id$ $Name$
 
+dohpaZ (2/2/07)
+------------------------
++ Updated version to 5.7.0.1
++ Assorted minor tweaks
++ Initial attempt to build with qmake
++ Fix odd crash in packet handling. 
++ Normalize some data type usage.
++ Remove ItemDB and related utilities from build since they haven't worked 
+  in a while and would really need a rewrite.  
++ Remove gdbm/db3 requirements
++ Update some copyright info.
+	
 purple (12/05/06)
 -----------------
 + Updated version to 5.7

Modified: showeq/trunk/INSTALL
===================================================================
--- showeq/trunk/INSTALL	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/INSTALL	2007-02-03 03:47:08 UTC (rev 664)
@@ -21,11 +21,7 @@
    *** 3rd party libraries ***                        
    qt         3.2   Compiled with -thread) http://www.trolltech.com)
    libpcap    0.62                         http://www.tcpdump.org/
-   gdbm       1.8.0                        http://www.gnu.org/software/gdbm/
 
-   *** Optional 3rd party libraries ***
-   db3        3.2.9  3.3 (Not db4)          http://www.sleepycat.com/
-
    *** C++ Compilation ***
    glibc      2.2  2.3.2                    http://www.gnu.org/software/libc/
    gcc        3.0.5  3.2                    http://gcc.gnu.org/

Modified: showeq/trunk/INSTALL.newbies
===================================================================
--- showeq/trunk/INSTALL.newbies	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/INSTALL.newbies	2007-02-03 03:47:08 UTC (rev 664)
@@ -94,8 +94,6 @@
 zlib-devel 
 gd 
 gd-devel 
-gdbm 
-gdbm-devel 
 glibc-kernheaders
 glibc-devel 
 xorg-x11-libs

Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/configure.in	2007-02-03 03:47:08 UTC (rev 664)
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.7.0.0)
+AC_INIT(showeq, 5.7.0.1)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CANONICAL_SYSTEM
 
@@ -220,9 +220,6 @@
 AC_CHECK_LIB(z, inflate,
 	, 
 	AC_MSG_ERROR(cannot find compresion library functions. Make sure libz is installed) )
-AC_CHECK_LIB(gdbm, gdbm_open,
-	, 
-	AC_MSG_ERROR(cannot find gdbm library functions. Make sure libgdbm is installed) )
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -439,82 +436,6 @@
 )
 AC_SUBST(PROFILE_LIBS)
 
-AC_ARG_WITH(db3-dir,
-	[  --with-db3-dir=DIR      where the root of Berkeley DB3 is installed. ],
-	[  db3_includes="$withval"/include
-	   db3_libs="$withval"/lib
-	])
-
-AC_ARG_WITH(db3-includes,
-	[  --with-db3-includes=DIR where the Berkeley DB3 includes are. ],
-	[  db3_includes="$withval"
-	])
-
-AC_ARG_WITH(db3-libraries,
-	[  --with-db3-libraries=DIR where the Berkeley DB3 libraries are. ],
-	[  db3_libs="$withval"
-	])
-
-AC_SUBST(db3_includes)
-AC_SUBST(db3_libs)
-
-if [[ -z "$db3_includes" ]]; then
- DB3_INCLUDES=""
-else
- DB3_INCLUDES="-I$db3_includes"
- all_includes="$DB3_INCLUDES $all_includes"
-fi
-
-if [[ -z "$db3_libs" ]]; then
- DB3_LDFLAGS=""
-else
- DB3_LDFLAGS="-L$db3_libs"
- all_libraries="$all_libraries $DB3_LDFLAGS"
-fi
-
-AC_SUBST(DB3_INCLUDES)
-AC_SUBST(DB3_LDFLAGS)
-
-AC_MSG_CHECKING(whether to build with Berkeley DB3)
-AC_ARG_WITH(db3,
-	[  --with-db3              Build with Berkeley DB 3],
-        [ AC_MSG_RESULT(yes)
-	  AC_LANG_SAVE
-	  db3_save_CPPFLAGS="$CPPFLAGS"
-	  CPPFLAGS="$CFLAGS $all_includes"
-          db3_save_LIBS="$LIBS"
-	  LIBS="$all_libraries -ldb_cxx"
-	  AC_LANG_CPLUSPLUS
-	  AC_CHECK_HEADER(db_cxx.h,,AC_MSG_ERROR(cannot find db_cxx.h, necessary for compilation with Berkeley DB 3 support))
-
-	  AC_MSG_CHECKING([for DbEnv::version in -ldb_cxx])
-	  AC_TRY_LINK([
-#include <stdio.h>
-#include <db_cxx.h>
-],
-[
-	printf("DB3: %s\n", DbEnv::version(NULL, NULL, NULL));
-],
-        db3_have_dbenv=yes,
-        db3_have_dbenv=no
-)
-	AC_MSG_RESULT($db3_have_dbenv)
-	if test "db3_have_dbenv" = "no"; then
-	 AC_MSG_ERROR([cannot find Berkeley DB3 C++ library functions.  Make sure libdb_cxx is installed])
-	else
-         AC_DEFINE(USE_DB3, 1, Define if using Berkeley DB3 for database operations)
-	fi
-dnl	  AC_CHECK_LIB(db_cxx, DbEnv::version,, AC_MSG_ERROR(cannot find Berkeley DB3 library functions. Make sure libdb_cxx is installed) )
-	 CPPFLAGS="$db3_save_CPPFLAGS"
-	 LIBS="$db3_save_LIBS"
-	  db3=true
-	 AC_LANG_RESTORE
-	],
-	[ AC_MSG_RESULT(no)
-	  db3=false ] 
-)
-AM_CONDITIONAL(USEDB3, test x$db3 = xtrue)
-
 AC_MSG_CHECKING(whether to build for use with the test server)
 AC_ARG_WITH(test-server,
 	[  --with-test-server      Compile for use with the test server ],

Modified: showeq/trunk/src/Makefile.am
===================================================================
--- showeq/trunk/src/Makefile.am	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/Makefile.am	2007-02-03 03:47:08 UTC (rev 664)
@@ -1,17 +1,9 @@
-INCLUDES = $(QT_INCLUDES) $(X_INCLUDES) $(DB3_INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)/\" -I/usr/include/pcap $(USER_INCLUDES)
+INCLUDES = $(QT_INCLUDES) $(X_INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)/\" -I/usr/include/pcap $(USER_INCLUDES)
 
 QTLIB = -lqt-mt
 
-if USEDB3
-DB3_SRCS = db3conv.cpp
-DB3_LIBS = $(DB3_LDFLAGS) -ldb_cxx
-endif
+bin_PROGRAMS = showeq 
 
-ITEMDB_SRCS = itemdb.cpp gdbmconv.cpp $(DB3_SRCS)
-nodist_ITEMDB_SRCS =  
-
-bin_PROGRAMS = showeq showeqitemdbtool
-
 showeq_SOURCES = main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp \
 	spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp \
 	packetinfo.cpp packet.cpp packetcapture.cpp packetformat.cpp interface.cpp compass.cpp \
@@ -23,21 +15,21 @@
 	datalocationmgr.cpp eqstr.cpp messages.cpp message.cpp messagefilter.cpp messagewindow.cpp \
 	messageshell.cpp terminal.cpp filteredspawnlog.cpp messagefilterdialog.cpp \
 	diagnosticmessages.cpp mapicon.cpp filternotifications.cpp netstream.cpp guildshell.cpp \
-	guildlist.cpp bazaarlog.cpp $(ITEMDB_SRCS) 
+	guildlist.cpp bazaarlog.cpp 
 
 showeq_moc_SRCS = bazaarlog.moc category.moc combatlog.moc compass.moc \
   compassframe.moc datetimemgr.moc editor.moc experiencelog.moc \
   filteredspawnlog.moc filtermgr.moc filternotifications.moc group.moc \
-  guild.moc guildlist.moc guildshell.moc interface.moc itemdb.moc logger.moc \
+  guild.moc guildlist.moc guildshell.moc interface.moc logger.moc \
   map.moc mapicon.moc messagefilter.moc messagefilterdialog.moc messages.moc \
   messageshell.moc messagewindow.moc netdiag.moc packet.moc packetinfo.moc \
   packetlog.moc packetstream.moc player.moc seqlistview.moc \
   seqwindow.moc skilllist.moc spawnlist.moc spawnlist2.moc spawnlistcommon.moc \
   spawnlog.moc spawnmonitor.moc spawnpointlist.moc spawnshell.moc spelllist.moc \
   spellshell.moc statlist.moc terminal.moc xmlpreferences.moc zonemgr.moc
-        
-nodist_showeq_SOURCES = ui_mapicondialog.h ui_mapicondialog.cpp $(showeq_moc_SRCS) m_ui_mapicondialog.cpp $(nodist_ITEMDB_SRCS)
 
+nodist_showeq_SOURCES = ui_mapicondialog.h ui_mapicondialog.cpp $(showeq_moc_SRCS) m_ui_mapicondialog.cpp 
+
 $(srcdir)/bazaarlog.cpp: bazaarlog.moc
 $(srcdir)/category.cpp: category.moc
 $(srcdir)/combatlog.cpp: combatlog.moc
@@ -54,7 +46,6 @@
 $(srcdir)/guildlist.cpp: guildlist.moc
 $(srcdir)/guildshell.cpp: guildshell.moc
 $(srcdir)/interface.cpp: interface.moc
-$(srcdir)/itemdb.cpp: itemdb.moc
 $(srcdir)/logger.cpp: logger.moc
 $(srcdir)/map.cpp: map.moc
 $(srcdir)/mapicon.cpp: mapicon.moc
@@ -87,13 +78,9 @@
 $(srcdir)/zonemgr.cpp: zonemgr.moc
 $(srcdir)/packetinfo.cpp: s_everquest.h
 
-showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(DB3_LIBS) $(LIBPTHREAD) $(MEMORY_LIBS) \
+showeq_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(MEMORY_LIBS) \
 $(PROFILE_LIBS) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
 
-showeqitemdbtool_SOURCES = itemdbtool.cpp util.cpp diagnosticmessageslight.cpp datalocationmgr.cpp $(ITEMDB_SRCS)
-nodist_showeqitemdbtool_SOURCES = $(nodist_ITEMDB_SRCS)
-showeqitemdbtool_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
-
 TEST_PROGS = sortitem
 
 if CGI
@@ -101,29 +88,21 @@
 GD_CGI_PROGS = drawmap.cgi
 endif
 
-CGI_PROGS = listitem.cgi showitem.cgi $(GD_CGI_PROGS) listspawn.cgi showspawn.cgi
+CGI_PROGS = $(GD_CGI_PROGS) listspawn.cgi showspawn.cgi
 endif
 
 noinst_PROGRAMS = $(TEST_PROGS) $(CGI_PROGS)
 
-listitem_cgi_SOURCES = listitem.cpp util.cpp diagnosticmessageslight.cpp  $(ITEMDB_SRCS) cgiconv.cpp
-nodist_listitem_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
-listitem_cgi_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
-
-showitem_cgi_SOURCES = showitem.cpp util.cpp diagnosticmessageslight.cpp  $(ITEMDB_SRCS) cgiconv.cpp
-nodist_showitem_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
-showitem_cgi_LDADD = $(QT_LDFLAGS) $(DB3_LIBS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
-
-listspawn_cgi_SOURCES = listspawn.cpp spawn.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
-nodist_listspawn_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
+ listspawn_cgi_SOURCES = listspawn.cpp spawn.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
+nodist_listspawn_cgi_SOURCES = 
 listspawn_cgi_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
 
 showspawn_cgi_SOURCES = showspawn.cpp spawn.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
-nodist_showspawn_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
+nodist_showspawn_cgi_SOURCES =
 showspawn_cgi_LDADD = $(QT_LDFLAGS) $(QTLIB) $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
 
 drawmap_cgi_SOURCES = drawmap.cpp util.cpp diagnosticmessageslight.cpp cgiconv.cpp
-nodist_drawmap_cgi_SOURCES = $(nodist_ITEMDB_SRCS)
+nodist_drawmap_cgi_SOURCES = 
 drawmap_cgi_LDADD = $(QT_LDFLAGS) $(QTLIB) -lgd $(LIBPTHREAD) $(SHOWEQ_RPATH) $(USER_LDFLAGS)
 
 sortitem_SOURCES = sortitem.cpp util.cpp diagnosticmessageslight.cpp 
@@ -132,7 +111,7 @@
 
 EXTRA_DIST = h2info.pl
 
-noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons29.h weapons2a.h weapons2b.h weapons2c.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h 
+noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons29.h weapons2a.h weapons2b.h weapons2c.h decode.h cgiconv.h skilllist.h statlist.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h 
 
 CLEANFILES = $(nodist_showeq_SOURCES)
 

Modified: showeq/trunk/src/bazaarlog.cpp
===================================================================
--- showeq/trunk/src/bazaarlog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/bazaarlog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
  *
- *  Copyright 2003-2004 by the respective ShowEQ Developers
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include <qdatetime.h>
@@ -65,5 +65,8 @@
   flush();
 }
 
+#ifndef QMAKEBUILD
 #include "bazaarlog.moc"
+#endif
 
+

Modified: showeq/trunk/src/category.cpp
===================================================================
--- showeq/trunk/src/category.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/category.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  * 
  * ShowEQ Distributed under GPL
  * http://seq.sf.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 // Author: Zaphod (do...@us...)
@@ -379,4 +381,7 @@
   }
 }
 
+#ifndef QMAKEBUILD
 #include "category.moc"
+#endif
+

Modified: showeq/trunk/src/combatlog.cpp
===================================================================
--- showeq/trunk/src/combatlog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/combatlog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include "combatlog.h"
@@ -987,4 +989,7 @@
   resetDPS();
 }
 
+#ifndef QMAKEBUILD
 #include "combatlog.moc"
+#endif
+

Modified: showeq/trunk/src/compass.cpp
===================================================================
--- showeq/trunk/src/compass.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/compass.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sf.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 //
@@ -22,7 +24,7 @@
 Compass::Compass (QWidget *parent, const char *name)
   : QWidget ( parent, name )
 {
-   ang = 0;
+   m_ang = 0;
    m_dSpawnAngle = -1;
 }
 
@@ -71,29 +73,27 @@
 
 void Compass::setHeading(int32_t degrees)
 {
-   if (ang == ((360-degrees)+90))
+   if (m_ang == ((360-degrees)+90))
      return;
-   ang = (360-degrees)+90;
+   m_ang = (360-degrees)+90;
    repaint ( compassRect(), FALSE);
-   emit angleChanged(ang);
+   emit angleChanged(m_ang);
 }
 
-void Compass::setPos(int16_t x, int16_t y)
+void Compass::setPos(int16_t x, int16_t y, int16_t z)
 {
-   m_cPlayer.setX(x);
-   m_cPlayer.setY(y);
-
+   m_cPlayer.setPoint(x, y, z);
+   
    if (m_dSpawnAngle > 0)
    {
       calcTargetHeading();
    }
 }
 
-void Compass::setTargetPos(int x,int y)
+void Compass::setTargetPos(int x,int y, int z)
 {
    // Recalc the mob heading
-   m_cTarget.setX(x);
-   m_cTarget.setY(y);
+   m_cTarget.setPoint(x,y,z);
 
    calcTargetHeading();
 }
@@ -128,7 +128,7 @@
 		pwd4, pix.height()-(phd4));
    tmp.translate(pwd2, phd2);
 
-   tmp.rotate (-ang);
+   tmp.rotate (-m_ang);
    tmp.setBrush(blue);
    tmp.setPen(blue);
    tmp.drawLine(0-pwd4, 0, pwd2, 0);
@@ -168,4 +168,7 @@
    p.end();
 }
 
+#ifndef QMAKEBUILD
 #include "compass.moc"
+#endif
+

Modified: showeq/trunk/src/compass.h
===================================================================
--- showeq/trunk/src/compass.h	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/compass.h	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sf.net/
+ *
+ *  Copyright 2002-2007 by the respective ShowEQ Developers
  */
 
 //
@@ -20,10 +22,15 @@
 #include <stdint.h>
 #endif
 
+#include "point.h"
+
 #include <qwidget.h>
 #include <qsize.h>
-#include <qpoint.h>
 
+///////////////////////////////////////////
+// type definitions
+typedef Point3D<int16_t> CompassPoint;
+
 class Compass : public QWidget
 {
    Q_OBJECT
@@ -35,8 +42,8 @@
 
  public slots:
    void setHeading(int32_t degrees);
-   void setPos(int16_t x, int16_t y);
-   void setTargetPos(int x, int y);
+   void setPos(int16_t x, int16_t y, int16_t z);
+   void setTargetPos(int x, int y, int z);
    void clearTarget(void);
 
  signals:
@@ -49,10 +56,10 @@
    void paintCompass ( QPainter * );
    void calcTargetHeading();
    QRect compassRect() const;
-   int ang;
+   int m_ang;
    double m_dSpawnAngle;
-   QPoint m_cPlayer;
-   QPoint m_cTarget;
+   CompassPoint m_cPlayer;
+   CompassPoint m_cTarget;
 };
 
 #endif // EQCOMPASS_H

Modified: showeq/trunk/src/compassframe.cpp
===================================================================
--- showeq/trunk/src/compassframe.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/compassframe.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sf.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include <qfont.h>
@@ -69,7 +71,7 @@
 				int16_t,int16_t,int16_t,int32_t)));
 
   // initialize compass
-  m_compass->setPos(player->x(), player->y());
+  m_compass->setPos(player->x(), player->y(), player->z());
   m_compass->setHeading(player->headingDegrees());
 }
 
@@ -80,7 +82,7 @@
 void CompassFrame::selectSpawn(const Item* item)
 {
    if (item)
-     m_compass->setTargetPos(item->x(), item->y());
+     m_compass->setTargetPos(item->x(), item->y(), item->z());
    else
      m_compass->clearTarget();
 }
@@ -90,7 +92,7 @@
 			      int32_t heading)
 {
   // set compass info
-  m_compass->setPos(x, y);
+  m_compass->setPos(x, y, z);
   m_compass->setHeading(heading);
 
   // set position labels
@@ -99,4 +101,7 @@
   m_z->setText(QString::number(z));
 }
 
+#ifndef QMAKEBUILD
 #include "compassframe.moc"
+#endif
+

Modified: showeq/trunk/src/datetimemgr.cpp
===================================================================
--- showeq/trunk/src/datetimemgr.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/datetimemgr.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2003 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2003,2007 Zaphod (do...@us...). All Rights Reserved.
  *
  * Contributed to ShowEQ by Zaphod (do...@us...) 
  * for use under the terms of the GNU General Public License, 
@@ -73,5 +73,7 @@
   }
 }
 
+#ifndef QMAKEBUILD
 #include "datetimemgr.moc"
+#endif
 

Modified: showeq/trunk/src/editor.cpp
===================================================================
--- showeq/trunk/src/editor.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/editor.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -6,6 +6,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
+ *
+ *  Copyright 2002-2007 by the respective ShowEQ Developers
  */
 
 /* Implementation of text editor class */
@@ -224,5 +226,6 @@
      }
  }
 
- #include "editor.moc"
- 
+#ifndef QMAKEBUILD
+#include "editor.moc"
+#endif 

Modified: showeq/trunk/src/experiencelog.cpp
===================================================================
--- showeq/trunk/src/experiencelog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/experiencelog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 
@@ -705,4 +707,7 @@
    seqInfo("ZEM - ZEM - ZEM ===== %d ", ZEM);
 }
 
+#ifndef QMAKEBUILD
 #include "experiencelog.moc"
+#endif
+

Modified: showeq/trunk/src/filteredspawnlog.cpp
===================================================================
--- showeq/trunk/src/filteredspawnlog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/filteredspawnlog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  *  http://www.sourceforge.net/projects/seq
  *
  *  Copyright 2001-2003 by the respective ShowEQ Developers
- *  Portions Copyright 2001-2003 Zaphod (do...@us...). 
+ *  Portions Copyright 2001-2007 Zaphod (do...@us...). 
  */
 
 #include "filteredspawnlog.h"
@@ -89,4 +89,7 @@
   flush();
 }
 
+#ifndef QMAKEBUILD
 #include "filteredspawnlog.moc"
+#endif
+

Modified: showeq/trunk/src/filtermgr.cpp
===================================================================
--- showeq/trunk/src/filtermgr.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/filtermgr.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 //
@@ -316,4 +318,7 @@
   emit runtimeFiltersChanged(type);
 }
 
+#ifndef QMAKEBUILD
 #include "filtermgr.moc"
+#endif
+

Modified: showeq/trunk/src/filternotifications.cpp
===================================================================
--- showeq/trunk/src/filternotifications.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/filternotifications.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
  * 
- * Portions Copyright 2003 Zaphod (do...@us...). 
+ * Portions Copyright 2003-2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -129,8 +129,11 @@
   system ((const char*)command);
 }
 
+#ifndef QMAKEBUILD
 #include "filternotifications.moc"
+#endif
 
 
 
 
+

Modified: showeq/trunk/src/group.cpp
===================================================================
--- showeq/trunk/src/group.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/group.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include "group.h"
@@ -372,4 +374,7 @@
   return m_members[slot]->m_spawn;
 }
 
+#ifndef QMAKEBUILD
 #include "group.moc"
+#endif
+

Modified: showeq/trunk/src/guild.cpp
===================================================================
--- showeq/trunk/src/guild.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/guild.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -6,6 +6,8 @@
  *
  * Copyright 2001 Fee (fe...@us...). All Rights Reserved.
  *
+ * Portions Copyright 2001-2007 by the respective ShowEQ Developers
+ *
  * Contributed to ShowEQ by fee (fe...@us...)
  * for use under the terms of the GNU General Public License,
  * incorporated herein by reference.
@@ -145,4 +147,7 @@
    }
 }
 
+#ifndef QMAKEBUILD
 #include "guild.moc"
+#endif
+

Modified: showeq/trunk/src/guildlist.cpp
===================================================================
--- showeq/trunk/src/guildlist.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/guildlist.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
  *
- *  Copyright 2004 Zaphod (do...@us...). 
+ *  Copyright 2004-2007 Zaphod (do...@us...). 
  *
  */
 
@@ -544,4 +544,7 @@
   m_guildTotals->setText(text.arg(m_membersOn).arg(m_guildShell->members().count()));
 }
 
+#ifndef QMAKEBUILD
 #include "guildlist.moc"
+#endif
+

Modified: showeq/trunk/src/guildshell.cpp
===================================================================
--- showeq/trunk/src/guildshell.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/guildshell.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
  *
- *  Copyright 2004 Zaphod (do...@us...). 
+ *  Copyright 2004-2007 Zaphod (do...@us...). 
  *
  */
 
@@ -323,7 +323,10 @@
   }
 }
 
+#ifndef QMAKEBUILD
 #include "guildshell.moc"
+#endif
 
 
 
+

Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/interface.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
  */
 
 #include "interface.h"
@@ -32,7 +34,6 @@
 #include "packetlog.h"
 #include "bazaarlog.h"
 #include "category.h"
-#include "itemdb.h"
 #include "guild.h"
 #include "guildshell.h"
 #include "guildlist.h"
@@ -107,7 +108,6 @@
     m_spellShell(0),
     m_groupMgr(0),
     m_spawnMonitor(0),
-    m_itemDB(0),
     m_guildmgr(0),
     m_guildShell(0),
     m_dateTimeMgr(0),
@@ -268,38 +268,6 @@
    // Create our player object
    m_player = new Player(this, m_zoneMgr, m_guildmgr);
 
-   section = "ItemDB";
-   if (pSEQPrefs->getPrefBool("Enabled", section, false))
-   {
-     seqDebug("ItemDB: Enabled");
-
-     // Create an instance of the ItemDB
-     m_itemDB = new EQItemDB(m_dataLocationMgr);
-
-     // make it's parameters match those set via the config file and 
-     // command line
-     fileName = pSEQPrefs->getPrefString("DataDBFilename", section, 
-					 "itemdata2");
-
-     fileInfo = m_dataLocationMgr->findWriteFile(".", fileName);
-
-     m_itemDB->SetDBFile(EQItemDB::DATA_DB, fileInfo.absFilePath());
-
-     fileName = pSEQPrefs->getPrefString("RawDataDBFilename", section, 
-					 "itemrawdata2");
-
-     m_itemDB->SetDBFile(EQItemDB::RAW_DATA_DB, fileInfo.absFilePath());
-     m_itemDB->SetEnabledDBTypes(pSEQPrefs->getPrefInt("DatabasesEnabled",
-						       section, 
-						       (EQItemDB::DATA_DB|EQItemDB::RAW_DATA_DB)));
-     m_itemDB->SetItemLogging(pSEQPrefs->getPrefBool("ItemLogging", "ItemDB", false));
-     m_itemDB->SetItemPacketLogging(pSEQPrefs->getPrefBool("ItemPackingLogging", "ItemDB", false));
-     // Make sure the databases are upgraded to the current format
-     m_itemDB->Upgrade();
-   }
-   else
-     seqDebug("ItemDB: Disabled");
-
    // Create the filter manager
    m_filterMgr = new FilterMgr(m_dataLocationMgr,
 			       pSEQPrefs->getPrefString("FilterFile", 
@@ -1050,11 +1018,6 @@
 						 SLOT(toggle_view_UnknownData()) , 
 						 Key_F9);
    m_id_log_RawData     = pLogMenu->insertItem("Raw Data", this, SLOT(toggle_log_RawData()), Key_F10);
-   if (m_itemDB)			      
-   {
-     m_id_log_Items  = pLogMenu->insertItem("Item Data", this, SLOT(toggle_log_ItemData()));
-     m_id_log_ItemPackets   = pLogMenu->insertItem("Item Packet Data", this, SLOT(toggle_log_ItemPacketData()));
-   }
    menuBar()->setItemChecked (m_id_log_AllPackets, (m_globalLog != 0));
    menuBar()->setItemChecked (m_id_log_WorldData, (m_worldLog != 0));
    menuBar()->setItemChecked (m_id_log_ZoneData, (m_zoneLog != 0));
@@ -1068,12 +1031,6 @@
 						     "PacketLogging",
 						     false));
 
-   if (m_itemDB)			      
-   {
-     menuBar()->setItemChecked (m_id_log_Items, m_itemDB->GetItemLogging());
-     menuBar()->setItemChecked (m_id_log_ItemPackets, m_itemDB->GetItemPacketLogging());
-   }
-
    // OpCode Monitor
    QPopupMenu* pOpCodeMenu = new QPopupMenu;
    m_netMenu->insertItem("OpCode Monitor", pOpCodeMenu);
@@ -1690,23 +1647,6 @@
 			m_zoneMgr, SLOT(zonePoints(const uint8_t*, size_t, uint8_t)));
    }
 
-   if (m_itemDB != 0)
-   {
-     // connect ItemDB slots to EQPacket signals
-     m_packet->connect2("OP_ItemPacket", SP_Zone, DIR_Server,
-			"itemPacketStruct", SZC_None,
-			m_itemDB, SLOT(item(const uint8_t*, size_t, uint8_t)));
-     m_packet->connect2("OP_ItemPlayerPacket", SP_Zone, DIR_Server,
-			"char", SZC_None, m_itemDB, 
-			SLOT(playerItem(const uint8_t*, size_t, uint8_t)));
-     m_packet->connect2("OP_ItemLinkResponse", SP_Zone, DIR_Server,
-			"itemInfoStruct", SZC_None, m_itemDB, 
-			SLOT(itemInfo(const uint8_t*, size_t, uint8_t)));
-     m_packet->connect2("OP_Shroud", SP_Zone, DIR_Server,
-            "spawnShroudOther", SZC_None, m_itemDB,
-            SLOT(playerShroud(const uint8_t*, size_t, uint8_t)));
-   }
-
    if (m_groupMgr != 0)
    {
      connect(m_zoneMgr, SIGNAL(playerProfile(const charProfileStruct*)),
@@ -2291,13 +2231,6 @@
   if (m_eqStrings != 0)
     delete m_eqStrings;
 
-  // Shutdown the Item DB before any other cleanup
-  if (m_itemDB != 0)
-     m_itemDB->Shutdown();
-
-  // delete the ItemDB before application exit
-  delete m_itemDB;
-
   if (m_player != 0)
     delete m_player;
 
@@ -3658,21 +3591,6 @@
   pSEQPrefs->setPrefBool("LogRawPackets", "PacketLogging", state);
 }
 
-void EQInterface::toggle_log_ItemData (void)
-{
-  m_itemDB->SetItemLogging(!m_itemDB->GetItemLogging());
-  menuBar()->setItemChecked (m_id_log_Items, m_itemDB->GetItemLogging());
-  pSEQPrefs->setPrefBool("ItemLogging", "ItemDB", m_itemDB->GetItemLogging());
-}
-
-void EQInterface::toggle_log_ItemPacketData (void)
-{
-  m_itemDB->SetItemPacketLogging(!m_itemDB->GetItemPacketLogging());
-  menuBar()->setItemChecked (m_id_log_ItemPackets, m_itemDB->GetItemPacketLogging());
-  pSEQPrefs->setPrefBool("ItemPacketLogging", "ItemDB", m_itemDB->GetItemPacketLogging());
-}
-
-
 /* Check and uncheck View menu options */
 void
 EQInterface::toggle_view_ChannelMsgs(int id)
@@ -6116,4 +6034,7 @@
   QMainWindow::setDockEnabled(dw, DockRight, enable);
 }
 
+#ifndef QMAKEBUILD
 #include "interface.moc"
+#endif
+

Modified: showeq/trunk/src/interface.h
===================================================================
--- showeq/trunk/src/interface.h	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/interface.h	2007-02-03 03:47:08 UTC (rev 664)
@@ -175,8 +175,6 @@
    void toggle_opt_BazaarData();
    void toggle_log_UnknownData();
    void toggle_log_RawData();
-   void toggle_log_ItemData();
-   void toggle_log_ItemPacketData();
    void listSpawns(void);
    void listDrops(void);
    void listMapInfo(void);
@@ -352,7 +350,6 @@
    SpellShell* m_spellShell;
    GroupMgr* m_groupMgr;
    SpawnMonitor* m_spawnMonitor;
-   EQItemDB* m_itemDB;
    GuildMgr* m_guildmgr; 
    GuildShell* m_guildShell;
    DateTimeMgr* m_dateTimeMgr;

Modified: showeq/trunk/src/itemdb.cpp
===================================================================
--- showeq/trunk/src/itemdb.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/itemdb.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  * 
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 static char* itemdbid = "@(#) $Id$ $Name$";
@@ -2542,4 +2544,7 @@
   return (((EQItemDBEntryData_3*)m_itemEntryData)->m_itemType == ItemTypeContainer);
 }
 	  
+#ifndef QMAKEBUILD
 #include "itemdb.moc"
+#endif
+

Modified: showeq/trunk/src/logger.cpp
===================================================================
--- showeq/trunk/src/logger.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/logger.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,6 +5,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include <stdio.h>
@@ -140,4 +142,7 @@
   fprintf (m_fp, "%03d | %-48s | %s \n\n", c, hex, asc);
 }
 
+#ifndef QMAKEBUILD
 #include "logger.moc"
+#endif
+

Modified: showeq/trunk/src/main.cpp
===================================================================
--- showeq/trunk/src/main.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/main.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -772,11 +772,14 @@
   printf ("\t\tUsing headers from linux version: %s\n",
 	  UTS_RELEASE);
 #endif
+#ifdef ITEMDB
   printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version());
   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
 #ifdef USE_DB3
   printf ("\tUsing DB3: %s\n", DB3Convenience::Version());
 #endif
+#endif
+
   /////////////////////////////////
   // Display current system environment information
   struct utsname utsbuff;

Modified: showeq/trunk/src/main.h
===================================================================
--- showeq/trunk/src/main.h	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/main.h	2007-02-03 03:47:08 UTC (rev 664)
@@ -19,8 +19,6 @@
 #include "xmlpreferences.h"
 extern class XMLPreferences *pSEQPrefs;
 
-class EQItemDB;
-
 #include "config.h"
 
 //----------------------------------------------------------------------

Modified: showeq/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/map.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
  * 
- * Portions Copyright 2001-2004 Zaphod (do...@us...). 
+ * Portions Copyright 2001-2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -1187,12 +1187,12 @@
   m_map->setShowBackgroundImage(!m_map->showBackgroundImage());
 }
 
-#ifdef DEBUG
 void MapMenu::toggle_debugInfo(int itemId)
 {
+#ifdef DEBUG
   m_map->setShowDebugInfo(!m_map->showDebugInfo());
+#endif
 }
-#endif
 
 void MapMenu::toggle_cacheAlwaysRepaint()
 {
@@ -2272,9 +2272,9 @@
     refreshMap ();
 }
 
-#ifdef DEBUG
 void Map::setShowDebugInfo(bool val) 
 { 
+#ifdef DEBUG
   m_showDebugInfo = val; 
   
   QString tmpPrefString = "ShowDebugInfo";
@@ -2282,8 +2282,8 @@
 
   if(!m_cacheChanges)
     refreshMap ();
+#endif
 }
-#endif
 
 void Map::setAnimate(bool val) 
 { 
@@ -4877,4 +4877,7 @@
 }
 
 
+#ifndef QMAKEBUILD
 #include "map.moc"
+#endif
+

Modified: showeq/trunk/src/map.h
===================================================================
--- showeq/trunk/src/map.h	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/map.h	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
  * 
- * Portions Copyright 2001-2004 Zaphod (do...@us...). 
+ * Portions Copyright 2001-2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -245,9 +245,7 @@
   void toggle_racePvP(int itemId);
   void toggle_walkPath(int itemId);
   void toggle_npcWalkPaths(int itemId);
-#ifdef DEBUG
   void toggle_debugInfo(int itemId);
-#endif
   void toggle_cacheAlwaysRepaint();
   void toggle_cacheChanges();
   void toggle_zoneSafePoint(int itemId);

Modified: showeq/trunk/src/mapcore.cpp
===================================================================
--- showeq/trunk/src/mapcore.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/mapcore.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://seq.sf.net/
  * 
- * Portions Copyright 2001-2003 Zaphod (do...@us...). 
+ * Portions Copyright 2001-2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -2223,7 +2223,9 @@
   : m_mapData(mapData),
     m_lastParam(mapData)
 {
+#ifdef DEBUG
   m_paintCount = 0;
+#endif
   m_painted = false;
   m_alwaysRepaint = false;
 }
@@ -2268,9 +2270,10 @@
   if (!needRepaint(param))
     return m_mapImage;
 
+#ifdef DEBUG
   // increment paint count
   m_paintCount++;
-
+#endif
   // set pixmap optimization if it's changed
   if (m_lastParam.mapOptimizationMethod() !=
       param.mapOptimizationMethod())

Modified: showeq/trunk/src/mapicon.cpp
===================================================================
--- showeq/trunk/src/mapicon.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/mapicon.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
  * 
- * Portions Copyright 2003-2004 Zaphod (do...@us...). 
+ * Portions Copyright 2003-2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -1282,4 +1282,7 @@
   return m_player->pickConColor(spawn->level());
 }
 
+#ifndef QMAKEBUILD
 #include "mapicon.moc"
+#endif
+

Modified: showeq/trunk/src/messagefilter.cpp
===================================================================
--- showeq/trunk/src/messagefilter.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messagefilter.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2003 Zaphod (do...@us...)
+ * Copyright 2003-2007 Zaphod (do...@us...)
  *
  */
 
@@ -190,4 +190,7 @@
   return mask;
 }
 
+#ifndef QMAKEBUILD
 #include "messagefilter.moc"
+#endif
+

Modified: showeq/trunk/src/messagefilterdialog.cpp
===================================================================
--- showeq/trunk/src/messagefilterdialog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messagefilterdialog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,6 +4,8 @@
  * ShowEQ Distributed under GPL
  * http://seq.sf.net/
  *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
+ *
  */
 
 #include "messagefilterdialog.h"
@@ -467,4 +469,6 @@
   m_delete->setEnabled(m_currentFilter != 0);
 }
 
+#ifndef QMAKEBUILD
 #include "messagefilterdialog.moc"
+#endif

Modified: showeq/trunk/src/messages.cpp
===================================================================
--- showeq/trunk/src/messages.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messages.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2002-2003 Zaphod (do...@us...)
+ * Copyright 2002-2003,2007 Zaphod (do...@us...)
  *
  */
 
@@ -82,4 +82,7 @@
       (*it).setFilterFlags((*it).filterFlags() | mask);
 }
 
+#ifndef QMAKEBUILD
 #include "messages.moc"
+#endif
+

Modified: showeq/trunk/src/messageshell.cpp
===================================================================
--- showeq/trunk/src/messageshell.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messageshell.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2002-2003 Zaphod (do...@us...)
+ * Copyright 2002-2003,2007 Zaphod (do...@us...)
  *
  */
 
@@ -1022,4 +1022,7 @@
 			 .arg(spawnInfo));
 }
 
+#ifndef QMAKEBUILD
 #include "messageshell.moc"
+#endif
+

Modified: showeq/trunk/src/messagewindow.cpp
===================================================================
--- showeq/trunk/src/messagewindow.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/messagewindow.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  * ShowEQ Distributed under GPL
  * http://seq.sf.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include "messagefilterdialog.h"
@@ -1175,4 +1177,7 @@
   m_hideUserFilterMenu->insertItem(filter.name(), filterid);
 }
 
+#ifndef QMAKEBUILD
 #include "messagewindow.moc"
+#endif
+

Modified: showeq/trunk/src/netdiag.cpp
===================================================================
--- showeq/trunk/src/netdiag.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/netdiag.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,6 +4,8 @@
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
  *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
+ *
  */
 
 #include <qpushbutton.h>
@@ -336,4 +338,7 @@
    return paddr;
 }
 
+#ifndef QMAKEBUILD
 #include "netdiag.moc"
+#endif
+

Modified: showeq/trunk/src/packet.cpp
===================================================================
--- showeq/trunk/src/packet.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packet.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  *  http://www.sourceforge.net/projects/seq
  *
  *  Copyright 2000-2004 by the respective ShowEQ Developers
- *  Portions Copyright 2001-2004 Zaphod (do...@us...). 
+ *  Portions Copyright 2001-2004,2007 Zaphod (do...@us...). 
  */
 
 /* Implementation of Packet class */
@@ -1145,4 +1145,7 @@
   return m_streams[stream]->arqSeqExp();
 }
 
+#ifndef QMAKEBUILD
 #include "packet.moc"
+#endif
+

Modified: showeq/trunk/src/packetinfo.cpp
===================================================================
--- showeq/trunk/src/packetinfo.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packetinfo.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  *  ShowEQ Distributed under GPL
  *  http://www.sourceforge.net/projects/seq
  *
- *  Copyright 2003-2004 Zaphod (do...@us...). 
+ *  Copyright 2003-2004,2007 Zaphod (do...@us...). 
  *
  */
 
@@ -741,4 +741,7 @@
   return true;
 }
 
+#ifndef QMAKEBUILD
 #include "packetinfo.moc"
+#endif
+

Modified: showeq/trunk/src/packetlog.cpp
===================================================================
--- showeq/trunk/src/packetlog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packetlog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  *  http://www.sourceforge.net/projects/seq
  *
  *  Copyright 2000-2004 by the respective ShowEQ Developers
- *  Portions Copyright 2001-2004 Zaphod (do...@us...). 
+ *  Portions Copyright 2001-2004,2007 Zaphod (do...@us...). 
  */
 
 #include <qdatetime.h>
@@ -508,4 +508,7 @@
   }
 }
 
+#ifndef QMAKEBUILD
 #include "packetlog.moc"
+#endif
+

Modified: showeq/trunk/src/packetstream.cpp
===================================================================
--- showeq/trunk/src/packetstream.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/packetstream.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  *  http://www.sourceforge.net/projects/seq
  *
  *  Copyright 2000-2003 by the respective ShowEQ Developers
- *  Portions Copyright 2001-2003 Zaphod (do...@us...). 
+ *  Portions Copyright 2001-2003,2007 Zaphod (do...@us...). 
  */
 
 /* Implementation of EQPacketStream class */
@@ -1220,4 +1220,7 @@
     m_sessionKey);
 }
 
+#ifndef QMAKEBUILD
 #include "packetstream.moc"
+#endif
+

Modified: showeq/trunk/src/player.cpp
===================================================================
--- showeq/trunk/src/player.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/player.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
  */
 
 #include "player.h"
@@ -1470,4 +1472,7 @@
   }
 }
 
+#ifndef QMAKEBUILD
 #include "player.moc"
+#endif
+

Modified: showeq/trunk/src/seqlistview.cpp
===================================================================
--- showeq/trunk/src/seqlistview.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/seqlistview.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2001 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2001,2007 Zaphod (do...@us...). All Rights Reserved.
  *
  * Contributed to ShowEQ by Zaphod (do...@us...) 
  * for use under the terms of the GNU General Public License, 
@@ -224,4 +224,7 @@
   triggerUpdate();
 }
 
+#ifndef QMAKEBUILD
 #include "seqlistview.moc"
+#endif
+

Modified: showeq/trunk/src/seqwindow.cpp
===================================================================
--- showeq/trunk/src/seqwindow.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/seqwindow.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2001-2003 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2001-2003,2007 Zaphod (do...@us...). All Rights Reserved.
  *
  * Contributed to ShowEQ by Zaphod (do...@us...) 
  * for use under the terms of the GNU General Public License, 
@@ -151,4 +151,6 @@
     QDockWindow::mousePressEvent(e);
 }
 
+#ifndef QMAKEBUILD
 #include "seqwindow.moc"
+#endif

Added: showeq/trunk/src/showeq.pro
===================================================================
--- showeq/trunk/src/showeq.pro	                        (rev 0)
+++ showeq/trunk/src/showeq.pro	2007-02-03 03:47:08 UTC (rev 664)
@@ -0,0 +1,32 @@
+TEMPLATE = app
+TARGET = showeq
+MOC_DIR = tmp
+OBJECTS_DIR = tmp
+UI_DIR = tmp
+CONFIG += qt thread stl warn_on debug
+DEFINES += PKGDATADIR=\"/usr/local/share/showeq\" 
+DEFINES += QMAKEBUILD
+LIBS += -lpcap
+
+SOURCES += main.cpp spawn.cpp spawnshell.cpp spawnlist.cpp spellshell.cpp \
+	spelllist.cpp vpacket.cpp editor.cpp filter.cpp packetfragment.cpp packetstream.cpp \
+	packetinfo.cpp packet.cpp packetcapture.cpp packetformat.cpp compass.cpp \
+	map.cpp util.cpp experiencelog.cpp combatlog.cpp player.cpp skilllist.cpp \
+	statlist.cpp filtermgr.cpp mapcore.cpp category.cpp compassframe.cpp group.cpp \
+	guild.cpp netdiag.cpp logger.cpp xmlconv.cpp xmlpreferences.cpp seqwindow.cpp \
+	seqlistview.cpp zonemgr.cpp spawnmonitor.cpp spawnpointlist.cpp spawnlistcommon.cpp \
+	spawnlist2.cpp spells.cpp datetimemgr.cpp spawnlog.cpp packetlog.cpp \
+	datalocationmgr.cpp eqstr.cpp messages.cpp message.cpp messagefilter.cpp messagewindow.cpp \
+	messageshell.cpp terminal.cpp filteredspawnlog.cpp messagefilterdialog.cpp \
+	diagnosticmessages.cpp mapicon.cpp filternotifications.cpp netstream.cpp guildshell.cpp \
+	guildlist.cpp bazaarlog.cpp 
+
+SOURCES += interface.cpp 
+
+INCLUDEPATH += ..
+INCLUDEPATH += /usr/include/pcap
+
+HEADES += ../config.h
+HEADERS += classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons29.h weapons2a.h weapons2b.h weapons2c.h decode.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h 
+FORMS += mapicondialog.ui 
+


Property changes on: showeq/trunk/src/showeq.pro
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + author id date revision
Name: svn:eol-style
   + native

Modified: showeq/trunk/src/skilllist.cpp
===================================================================
--- showeq/trunk/src/skilllist.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/skilllist.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
+ *
+ *  Copyright 2003-2007 by the respective ShowEQ Developers
  */
 
 #include "player.h"
@@ -263,4 +265,7 @@
   m_skillList->savePrefs();
 }
 
+#ifndef QMAKEBUILD
 #include "skilllist.moc"
+#endif
+

Modified: showeq/trunk/src/spawnlist.cpp
===================================================================
--- showeq/trunk/src/spawnlist.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlist.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
  */
 
 /*
@@ -1175,4 +1177,7 @@
   m_spawnList->savePrefs();
 }
 
+#ifndef QMAKEBUILD
 #include "spawnlist.moc"
+#endif
+

Modified: showeq/trunk/src/spawnlist2.cpp
===================================================================
--- showeq/trunk/src/spawnlist2.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlist2.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -1,4 +1,11 @@
-
+/*
+ * spawnlist2.cpp
+ *
+ *  ShowEQ Distributed under GPL
+ *  http://www.sourceforge.net/projects/seq
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
+ */
 #include "spawnlist2.h"
 #include "category.h"
 #include "spawnshell.h"
@@ -947,4 +954,7 @@
 #endif 
 }
 
+#ifndef QMAKEBUILD
 #include "spawnlist2.moc"
+#endif
+

Modified: showeq/trunk/src/spawnlistcommon.cpp
===================================================================
--- showeq/trunk/src/spawnlistcommon.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlistcommon.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
  */
 
 /*
@@ -743,4 +745,7 @@
     m_spawnlistWindow->setCaption(caption);
 }
 
+#ifndef QMAKEBUILD
 #include "spawnlistcommon.moc"
+#endif
+

Modified: showeq/trunk/src/spawnlog.cpp
===================================================================
--- showeq/trunk/src/spawnlog.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnlog.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  *  http://www.sourceforge.net/projects/seq
  *
  *  Copyright 2001-2003 by the respective ShowEQ Developers
- *  Portions Copyright 2001-2003 Zaphod (do...@us...). 
+ *  Portions Copyright 2001-2003,2007 Zaphod (do...@us...). 
  */
 
 #include "spawn.h"
@@ -143,4 +143,7 @@
   zoneShortName = zonename;
 }
 
+#ifndef QMAKEBUILD
 #include "spawnlog.moc"
+#endif
+

Modified: showeq/trunk/src/spawnmonitor.cpp
===================================================================
--- showeq/trunk/src/spawnmonitor.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnmonitor.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  * http://seq.sourceforge.net/
  *
  * Borrowed from:  SINS Distributed under GPL
- * Portions Copyright 2001 Zaphod (do...@us...). 
+ * Portions Copyright 2001,2007 Zaphod (do...@us...). 
  *
  * For use under the terms of the GNU General Public License, 
  * incorporated herein by reference.
@@ -406,4 +406,6 @@
   m_modified = false;
 }
 
+#ifndef QMAKEBUILD
 #include "spawnmonitor.moc"
+#endif

Modified: showeq/trunk/src/spawnpointlist.cpp
===================================================================
--- showeq/trunk/src/spawnpointlist.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnpointlist.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -5,7 +5,7 @@
  * http://seq.sourceforge.net/
  *
  * Borrowed from:  SINS Distributed under GPL
- * Portions Copyright 2001 Zaphod (do...@us...). 
+ * Portions Copyright 2001,2007 Zaphod (do...@us...). 
  *
  * For use under the terms of the GNU General Public License, 
  * incorporated herein by reference.
@@ -569,4 +569,7 @@
     m_spawnPointList->savePrefs();
 }
 
+#ifndef QMAKEBUILD
 #include "spawnpointlist.moc"
+#endif
+

Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spawnshell.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  * 
- * Portions Copyright 2001-2003 Zaphod (do...@us...). 
+ * Portions Copyright 2001-2003,2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -1461,4 +1461,7 @@
   }
 }
 
+#ifndef QMAKEBUILD
 #include "spawnshell.moc"
+#endif
+

Modified: showeq/trunk/src/spelllist.cpp
===================================================================
--- showeq/trunk/src/spelllist.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spelllist.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
+ *
+ *  Copyright 2001-2007 by the respective ShowEQ Developers
  */
  
 /*
@@ -394,4 +396,6 @@
   m_spellList->savePrefs();
 }
 
+#ifndef QMAKEBUILD
 #include "spelllist.moc"
+#endif

Modified: showeq/trunk/src/spellshell.cpp
===================================================================
--- showeq/trunk/src/spellshell.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/spellshell.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -7,7 +7,7 @@
  * Crazy Joe Divola (cj...@us...)
  * September 5, 2001
  * 
- * Portions Copyright 2003 Zaphod (do...@us...). 
+ * Portions Copyright 2003-2007 Zaphod (do...@us...). 
  * 
  */
 
@@ -540,4 +540,7 @@
     m_timer->stop();
 }
 
+#ifndef QMAKEBUILD
 #include "spellshell.moc"
+#endif
+

Modified: showeq/trunk/src/statlist.cpp
===================================================================
--- showeq/trunk/src/statlist.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/statlist.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,8 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
  */
 
 #include <qlayout.h>
@@ -352,4 +354,7 @@
   m_statList->savePrefs();
 }
 
+#ifndef QMAKEBUILD
 #include "statlist.moc"
+#endif
+

Modified: showeq/trunk/src/terminal.cpp
===================================================================
--- showeq/trunk/src/terminal.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/terminal.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2003 Zaphod (do...@us...)
+ * Copyright 2003-2007 Zaphod (do...@us...)
  *
  */
 
@@ -214,4 +214,7 @@
   fputc('\n', stdout);
 }
 
+#ifndef QMAKEBUILD
 #include "terminal.moc"
+#endif
+

Modified: showeq/trunk/src/util.cpp
===================================================================
--- showeq/trunk/src/util.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/util.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -3,6 +3,9 @@
  *
  *  ShowEQ Distributed under GPL
  *  http://seq.sourceforge.net/
+ *
+ *  Copyright 2000-2007 by the respective ShowEQ Developers
+ *
  */
 
 #include "util.h"
@@ -579,7 +582,7 @@
   return slotname;
 }
 
-uint32_t calc_exp (int level, uint16_t race, uint8_t class_)
+uint32_t calc_exp (int32_t level, uint16_t race, uint8_t class_)
 {
 
   float exp=level*level*level;
@@ -646,7 +649,7 @@
   default : exp*=10;
   }
   
-  return (unsigned long)(exp);
+  return (uint32_t)(exp);
 }
 
 //
@@ -968,7 +971,7 @@
 uint16_t calcCRC16(uint8_t* p, uint32_t length, uint32_t seed)
 {
 #include "crctab.h"
-   unsigned long crc = 0L ^ 0xffffffff;
+   uint32_t crc = 0L ^ 0xffffffff;
 
    // CRC each byte of the seed
    crc = crc >> 8 ^ crctab[(seed       ^ crc) & 0xFF];
@@ -978,9 +981,7 @@
 
    // Then crc the buffer
    while(length--)
-   {                
       crc = crc >> 8 ^ crctab[(*(p++) ^ crc) & 0xFF];
-   } 
 
    return crc ^ 0xffffffffL; 
 }

Modified: showeq/trunk/src/xmlpreferences.cpp
===================================================================
--- showeq/trunk/src/xmlpreferences.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/xmlpreferences.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -917,4 +917,6 @@
   setPref(inName, inSection, inValue, pers);
 }
 
+#ifndef QMAKEBUILD
 #include "xmlpreferences.moc"
+#endif

Modified: showeq/trunk/src/zonemgr.cpp
===================================================================
--- showeq/trunk/src/zonemgr.cpp	2007-02-02 11:40:07 UTC (rev 663)
+++ showeq/trunk/src/zonemgr.cpp	2007-02-03 03:47:08 UTC (rev 664)
@@ -4,7 +4,7 @@
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
  *
- * Copyright 2001 Zaphod (do...@us...). All Rights Reserved.
+ * Copyright 2001,2007 Zaphod (do...@us...). All Rights Reserved.
  *
  * Contributed to ShowEQ by Zaphod (do...@us...) 
  * for use under the terms of the GNU General Public License, 
@@ -273,5 +273,6 @@
 	 sizeof(zonePointStruct) * m_zonePointCount);
 }
 
+#ifndef QMAKEBUILD
 #include "zonemgr.moc"
-
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Seq-cvs-commit] showeq/src Makefile.am,1.23,1.24

From: Chad M. <cmm...@us...> - 2006-12-05 23:48:28

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27929/src

Modified Files:
	Makefile.am 
Log Message:

add new weapon header file to automake file.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/seq/showeq/src/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	13 Sep 2005 15:23:10 -0000	1.23
+++ Makefile.am	5 Dec 2006 23:48:25 -0000	1.24
@@ -132,7 +132,7 @@
 
 EXTRA_DIST = h2info.pl
 
-noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons29.h weapons2a.h weapons2b.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h 
+noinst_HEADERS = classes.h compass.h everquest.h interface.h main.h map.h filter.h vpacket.h editor.h packet.h packetcapture.h packetcommon.h packetformat.h packetstream.h packetfragment.h packetinfo.h races.h skills.h spells.h util.h experiencelog.h combatlog.h spawn.h spawnshell.h spawnlist.h spellshell.h spelllist.h languages.h weapons.h weapons1.h weapons27.h weapons28.h weapons29.h weapons2a.h weapons2b.h weapons2c.h decode.h itemdb.h gdbmconv.h cgiconv.h skilllist.h statlist.h db3conv.h dbcommon.h deity.h player.h crctab.h filtermgr.h point.h pointarray.h mapcore.h category.h compassframe.h group.h guild.h fixpt.h netdiag.h zones.h logger.h xmlconv.h xmlpreferences.h seqwindow.h seqlistview.h zonemgr.h spawnmonitor.h spawnpointlist.h typenames.h spawnlistcommon.h spawnlist2.h datetimemgr.h spawnlog.h packetlog.h datalocationmgr.h eqstr.h messages.h messagefilter.h messagewindow.h messageshell.h terminal.h filteredspawnlog.h messagefilterdialog.h diagnosticmessages.h mapicon.h mapicondialog.ui mapicondialog.ui.h filternotifications.h netstream.h guildshell.h guildlist.h bazaarlog.h message.h s_everquest.h staticspells.h 
 
 CLEANFILES = $(nodist_showeq_SOURCES)

[Seq-cvs-commit] showeq ChangeLog, 1.28, 1.29 configure.in, 1.70, 1.71

From: Chad M. <cmm...@us...> - 2006-12-05 23:28:15

Update of /cvsroot/seq/showeq
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19642

Modified Files:
	ChangeLog configure.in 
Log Message:

Version to 5.7. Padded newZoneStruct to match 12/5 live.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/seq/showeq/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	4 Nov 2006 19:00:53 -0000	1.28
+++ ChangeLog	5 Dec 2006 23:27:39 -0000	1.29
@@ -1,8 +1,10 @@
 Version: $Id$ $Name$
 
-purple (11/04/06)
+purple (12/05/06)
 -----------------
++ Updated version to 5.7
 + Added some more weapon descriptions (from uRit12cBBa)
++ Added unknowns to balance newZoneStruct
 
 purple (11/04/06)
 -----------------

Index: configure.in
===================================================================
RCS file: /cvsroot/seq/showeq/configure.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- configure.in	4 Nov 2006 17:44:06 -0000	1.70
+++ configure.in	5 Dec 2006 23:27:39 -0000	1.71
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.6.1.0)
+AC_INIT(showeq, 5.7.0.0)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CANONICAL_SYSTEM

[Seq-cvs-commit] showeq/src everquest.h,1.94,1.95

From: Chad M. <cmm...@us...> - 2006-12-05 23:27:47

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19642/src

Modified Files:
	everquest.h 
Log Message:

Version to 5.7. Padded newZoneStruct to match 12/5 live.


Index: everquest.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/everquest.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- everquest.h	30 Sep 2006 21:18:24 -0000	1.94
+++ everquest.h	5 Dec 2006 23:27:40 -0000	1.95
@@ -589,12 +589,16 @@
 /*0604*/ float   underworld;               // Underworld
 /*0608*/ float   minclip;                  // Minimum view distance
 /*0612*/ float   maxclip;                  // Maximum view distance
-/*0616*/ uint8_t unknown0616[172];         // *** Placeholder
-/*0788*/ uint8_t unknown0788[4];           // *** Placeholder (06/29/2005)
-/*0792*/ uint8_t unknown0792[4];           // *** Placeholder (09/13/2005)
-/*0796*/ uint8_t unknown0796[4];           // *** Placeholder (02/21/2006)
-/*0800*/ uint8_t unknown0800[36];          // *** Placeholder (06/13/2006)
-}; /*0836*/
+/*0616*/ uint8_t unknown0616[84];          // *** Placeholder
+/*0700*/ char    zonefile[64];             // Zone file name?
+/*0764*/ uint8_t unknown0764[36];          // *** Placeholder (12/05/2006)
+/*0800*/ uint8_t unknown0800[12];          // *** Placeholder 
+/*0812*/ uint8_t unknown0812[4];           // *** Placeholder (06/29/2005)
+/*0816*/ uint8_t unknown0816[4];           // *** Placeholder (09/13/2005)
+/*0820*/ uint8_t unknown0620[4];           // *** Placeholder (02/21/2006)
+/*0824*/ uint8_t unknown0824[36];          // *** Placeholder (06/13/2006)
+/*0860*/ uint8_t unknown0860[12];          // *** Placeholder (12/05/2006)
+}; /*0872*/
 
 
 /**

[Seq-cvs-commit] showeq/src weapons2c.h,NONE,1.1

From: Bonkers D B. <bon...@us...> - 2006-11-04 20:24:40

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2022

Added Files:
	weapons2c.h 
Log Message:

Added uRit's weapons2c.h file


--- NEW FILE: weapons2c.h ---
/*
 * weapons2c.h
 *
 * ShowEQ Distributed under GPL
 * http://seq.sourceforge.net/
 */
 
#ifndef DOXYGEN_SHOULD_SKIP_THIS
    NULL,                 // 0x00
    NULL,                 // 0x01
    NULL,                 // 0x02
    NULL,                 // 0x03
    NULL,                 // 0x04
    NULL,                 // 0x05
    NULL,                 // 0x06
    NULL,                 // 0x07
    NULL,                 // 0x08
    NULL,                 // 0x09
    NULL,                 // 0x0a
    NULL,                 // 0x0b
    NULL,                 // 0x0c
    NULL,                 // 0x0d
    NULL,                 // 0x0e
    NULL,                 // 0x0f
    NULL,                 // 0x10
    NULL,                 // 0x11
    NULL,                 // 0x12
    NULL,                 // 0x13
    NULL,                 // 0x14
    NULL,                 // 0x15
    NULL,                 // 0x16
    NULL,                 // 0x17
    NULL,                 // 0x18
    NULL,                 // 0x19
    NULL,                 // 0x1a
    NULL,                 // 0x1b
    NULL,                 // 0x1c
    NULL,                 // 0x1d
    NULL,                 // 0x1e
    NULL,                 // 0x1f
    NULL,                 // 0x20
    NULL,                 // 0x21
    NULL,                 // 0x22
    NULL,                 // 0x23
    NULL,                 // 0x24
    NULL,                 // 0x25
    NULL,                 // 0x26
    NULL,                 // 0x27
    NULL,                 // 0x28
    NULL,                 // 0x29
    NULL,                 // 0x2a
    NULL,                 // 0x2b
    NULL,                 // 0x2c
    NULL,                 // 0x2d
    NULL,                 // 0x2e
    NULL,                 // 0x2f
    NULL,                 // 0x30
    NULL,                 // 0x31
    NULL,                 // 0x32
    NULL,                 // 0x33
    NULL,                 // 0x34
    NULL,                 // 0x35
    NULL,                 // 0x36
    NULL,                 // 0x37
    NULL,                 // 0x38
    NULL,                 // 0x39
    NULL,                 // 0x3a
    NULL,                 // 0x3b
    NULL,                 // 0x3c
    NULL,                 // 0x3d
    NULL,                 // 0x3e
    NULL,                 // 0x3f
    NULL,                 // 0x40
    NULL,                 // 0x41
    NULL,                 // 0x42
    NULL,                 // 0x43
    NULL,                 // 0x44
    NULL,                 // 0x45
    NULL,                 // 0x46
    NULL,                 // 0x47
    NULL,                 // 0x48
    NULL,                 // 0x49
    NULL,                 // 0x4a
    NULL,                 // 0x4b
    NULL,                 // 0x4c
    NULL,                 // 0x4d
    NULL,                 // 0x4e
    NULL,                 // 0x4f
    NULL,                 // 0x50
    NULL,                 // 0x51
    NULL,                 // 0x52
    NULL,                 // 0x53
    NULL,                 // 0x54
    NULL,                 // 0x55
    NULL,                 // 0x56
    NULL,                 // 0x57
    NULL,                 // 0x58
    NULL,                 // 0x59
    NULL,                 // 0x5a
    NULL,                 // 0x5b
    NULL,                 // 0x5c
    NULL,                 // 0x5d
    NULL,                 // 0x5e
    NULL,                 // 0x5f
    NULL,                 // 0x60
    NULL,                 // 0x61
    NULL,                 // 0x62
    NULL,                 // 0x63
    NULL,                 // 0x64
    NULL,                 // 0x65
    NULL,                 // 0x66
    NULL,                 // 0x67
    NULL,                 // 0x68
    NULL,                 // 0x69
    NULL,                 // 0x6a
    NULL,                 // 0x6b
    NULL,                 // 0x6c
    NULL,                 // 0x6d
    NULL,                 // 0x6e
    NULL,                 // 0x6f
    NULL,                 // 0x70
    NULL,                 // 0x71
    NULL,                 // 0x72
    NULL,                 // 0x73
    NULL,                 // 0x74
    NULL,                 // 0x75
    NULL,                 // 0x76
    NULL,                 // 0x77
    NULL,                 // 0x78
    NULL,                 // 0x79
    NULL,                 // 0x7a
    NULL,                 // 0x7b
    NULL,                 // 0x7c
    NULL,                 // 0x7d
    NULL,                 // 0x7e
    NULL,                 // 0x7f
    NULL,                 // 0x80
    NULL,                 // 0x81
    NULL,                 // 0x82
    NULL,                 // 0x83
    NULL,                 // 0x84
    NULL,                 // 0x85
    NULL,                 // 0x86
    NULL,                 // 0x87
    NULL,                 // 0x88
    NULL,                 // 0x89
    NULL,                 // 0x8a
    NULL,                 // 0x8b
    NULL,                 // 0x8c
    NULL,                 // 0x8d
    NULL,                 // 0x8e
    NULL,                 // 0x8f
    NULL,                 // 0x90
    NULL,                 // 0x91
    NULL,                 // 0x92
    NULL,                 // 0x93
    NULL,                 // 0x94
    NULL,                 // 0x95
    NULL,                 // 0x96
    NULL,                 // 0x97
    NULL,                 // 0x98
    NULL,                 // 0x99
    NULL,                 // 0x9a
    NULL,                 // 0x9b
    NULL,                 // 0x9c
    NULL,                 // 0x9d
    NULL,                 // 0x9e
    NULL,                 // 0x9f
    NULL,                 // 0xa0
    NULL,                 // 0xa1
    NULL,                 // 0xa2
    NULL,                 // 0xa3
    NULL,                 // 0xa4
    NULL,                 // 0xa5
    NULL,                 // 0xa6
    NULL,                 // 0xa7
    NULL,                 // 0xa8
    NULL,                 // 0xa9
    NULL,                 // 0xaa
    NULL,                 // 0xab
    NULL,                 // 0xac
    NULL,                 // 0xad
    NULL,                 // 0xae
    NULL,                 // 0xaf
    NULL,                 // 0xb0
    NULL,                 // 0xb1
    NULL,                 // 0xb2
    NULL,                 // 0xb3
    NULL,                 // 0xb4
    NULL,                 // 0xb5
    NULL,                 // 0xb6
    NULL,                 // 0xb7
    NULL,                 // 0xb8
    NULL,                 // 0xb9
    NULL,                 // 0xba
    NULL,                 // 0xbb
    NULL,                 // 0xbc
    NULL,                 // 0xbd
    NULL,                 // 0xbe
    NULL,                 // 0xbf
    NULL,                 // 0xc0
    NULL,                 // 0xc1
    NULL,                 // 0xc2
    NULL,                 // 0xc3
    NULL,                 // 0xc4
    NULL,                 // 0xc5
    NULL,                 // 0xc6
    NULL,                 // 0xc7
    NULL,                 // 0xc8
    NULL,                 // 0xc9
    NULL,                 // 0xca
    NULL,                 // 0xcb
    NULL,                 // 0xcc
    NULL,                 // 0xcd
    NULL,                 // 0xce
    NULL,                 // 0xcf
    NULL,                 // 0xd0
    NULL,                 // 0xd1
    NULL,                 // 0xd2
    NULL,                 // 0xd3
    NULL,                 // 0xd4
    NULL,                 // 0xd5
    NULL,                 // 0xd6
    NULL,                 // 0xd7
    NULL,                 // 0xd8
    NULL,                 // 0xd9
    NULL,                 // 0xda
    NULL,                 // 0xdb
    NULL,                 // 0xdc
    NULL,                 // 0xdd
    NULL,                 // 0xde
    NULL,                 // 0xdf
    NULL,                 // 0xe0
    NULL,                 // 0xe1
    NULL,                 // 0xe2
    NULL,                 // 0xe3
    NULL,                 // 0xe4
    NULL,                 // 0xe5
    NULL,                 // 0xe6
    NULL,                 // 0xe7
    NULL,                 // 0xe8
    NULL,                 // 0xe9
    NULL,                 // 0xea
    NULL,                 // 0xeb
    NULL,                 // 0xec
    "Drum",               // 0xed
    "Lute",               // 0xee
    NULL,                 // 0xef
    NULL,                 // 0xf0
    NULL,                 // 0xf1
    NULL,                 // 0xf2
    NULL,                 // 0xf3
    NULL,                 // 0xf4
    NULL,                 // 0xf5
    NULL,                 // 0xf6
    NULL,                 // 0xf7
    NULL,                 // 0xf8
    NULL,                 // 0xf9
    NULL,                 // 0xfa
    NULL,                 // 0xfb
    NULL,                 // 0xfc
    NULL,                 // 0xfd
    NULL,                 // 0xfe
    NULL,                 // 0xff
#endif /* DOXYGEN_SHOULD_SKIP_THIS */

[Seq-cvs-commit] showeq ChangeLog,1.27,1.28

From: Chad M. <cmm...@us...> - 2006-11-04 19:00:59

Update of /cvsroot/seq/showeq
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1072

Modified Files:
	ChangeLog 
Log Message:

Weapon descriptions update from uRit.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/seq/showeq/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	4 Nov 2006 17:44:06 -0000	1.27
+++ ChangeLog	4 Nov 2006 19:00:53 -0000	1.28
@@ -2,6 +2,10 @@
 
 purple (11/04/06)
 -----------------
++ Added some more weapon descriptions (from uRit12cBBa)
+
+purple (11/04/06)
+-----------------
 + Updated version to 5.6.1
 + Fixed con range. Stupid double ++ error.
 + Redid gradients for red con colors

[Seq-cvs-commit] showeq/src spawn.cpp, 1.35, 1.36 weapons.h, 1.6, 1.7 weapons1.h, 1.2, 1.3 weapons27.h, 1.5, 1.6 weapons28.h, 1.2, 1.3 weapons2b.h, 1.3, 1.4

From: Chad M. <cmm...@us...> - 2006-11-04 19:00:57

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1072/src

Modified Files:
	spawn.cpp weapons.h weapons1.h weapons27.h weapons28.h 
	weapons2b.h 
Log Message:

Weapon descriptions update from uRit.


Index: weapons.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- weapons.h	13 Sep 2005 15:23:14 -0000	1.6
+++ weapons.h	4 Nov 2006 19:00:53 -0000	1.7
@@ -143,7 +143,7 @@
     NULL,                   // 0x86 - Unknown Weapon
     NULL,                   // 0x87 - Unknown Weapon
     "Claw",                 // 0x88
-    NULL,                   // 0x89 - Unknown Weapon
+    "Tambourine",           // 0x89 - Unknown Weapon
     NULL,                   // 0x8a - Unknown Weapon
     NULL,                   // 0x8b - Unknown Weapon
     "Ragebringer",          // 0x8c
@@ -256,7 +256,7 @@
     NULL,                   // 0xf7 - Unknown Weapon
     NULL,                   // 0xf8 - Unknown Weapon
     NULL,                   // 0xf9 - Unknown Weapon
-    NULL,                   // 0xfa - Unknown Weapon
+    "Lollipop",             // 0xfa - Unknown Weapon
     NULL,                   // 0xfb - Unknown Weapon
     NULL,                   // 0xfc - Unknown Weapon
     NULL,                   // 0xfd - Unknown Weapon

Index: weapons28.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons28.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- weapons28.h	13 Sep 2005 15:23:14 -0000	1.2
+++ weapons28.h	4 Nov 2006 19:00:53 -0000	1.3
@@ -134,7 +134,6 @@
     NULL,                 // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

Index: spawn.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawn.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- spawn.cpp	4 Nov 2006 17:44:08 -0000	1.35
+++ spawn.cpp	4 Nov 2006 19:00:53 -0000	1.36
@@ -92,6 +92,12 @@
 #include "weapons2b.h"
   };
 
+  // sparse array of item names (in 0x2c range), some are NULL
+  static const char*  itemnames2c[] = 
+  {
+#include "weapons2c.h"
+  };
+
   // assume no material name found
   const char *itemStr = NULL;
 
@@ -140,6 +146,12 @@
     if (itemLo < (sizeof(itemnames2b) / sizeof (char*)))
       itemStr = itemnames2b[itemLo];
   }
+  else if (itemHi == 0x2c)
+  {
+    // retrieve pointer to item name
+    if (itemLo < (sizeof(itemnames2c) / sizeof (char*)))
+      itemStr = itemnames2c[itemLo];
+  }
 
   // if race name exists, then return it, otherwise return a number string
   if (itemStr != NULL)

Index: weapons27.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons27.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- weapons27.h	13 Sep 2005 15:23:14 -0000	1.5
+++ weapons27.h	4 Nov 2006 19:00:53 -0000	1.6
@@ -134,7 +134,6 @@
     "Bone Spear",         // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

Index: weapons2b.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons2b.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- weapons2b.h	30 Sep 2006 21:18:26 -0000	1.3
+++ weapons2b.h	4 Nov 2006 19:00:53 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * weapons2bh
+ * weapons2b.h
  *
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
@@ -134,7 +134,6 @@
     NULL,                 // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

Index: weapons1.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- weapons1.h	13 Sep 2005 15:23:14 -0000	1.2
+++ weapons1.h	4 Nov 2006 19:00:53 -0000	1.3
@@ -134,7 +134,6 @@
     NULL,                 // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

[Seq-cvs-commit] showeq/conf zoneopcodes.xml,1.17,1.18

From: Chad M. <cmm...@us...> - 2006-11-04 17:44:21

Update of /cvsroot/seq/showeq/conf
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3140/conf

Modified Files:
	zoneopcodes.xml 
Log Message:

Release 5.6.1.
Better handle hover mode death
Process ZoneEntry for auras as a newSpawn.



Index: zoneopcodes.xml
===================================================================
RCS file: /cvsroot/seq/showeq/conf/zoneopcodes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- zoneopcodes.xml	30 Sep 2006 21:18:24 -0000	1.17
+++ zoneopcodes.xml	4 Nov 2006 17:44:07 -0000	1.18
@@ -30,9 +30,9 @@
     <opcode id="6ea7" name="OP_TributeUpdate" updated="06/13/06">
         <comment>Tribute information</comment>
     </opcode>
-    <opcode id="4e7d" name="OP_ItemPlayerPacket" updated="06/13/06">
-        <comment>old ItemCode</comment>
-        <payload dir="server" typename="char" sizechecktype="none"/>
+    <opcode id="4e7d" name="OP_ItemPlayerPacket" updated="10/22/06">
+        <comment>Inventory/bank items coming over during zone</comment>
+        <payload dir="server" typename="uint8_t" sizechecktype="none"/>
     </opcode>
     <opcode id="4135" name="OP_TaskDescription" updated="06/13/06">
         <comment>Task descriptions coming down for task window</comment>
@@ -142,6 +142,13 @@
         <comment>old NewCorpseCode</comment>
         <payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
     </opcode>
+    <opcode id="3c2a" name="OP_RespawnWindow" updated="10/22/06">
+      <comment>Server telling client enough to populate the respawn window when you die</comment>
+    </opcode>
+    <opcode id="6dc2" name="OP_RespawnFromHover" updated="10/22/06">
+      <comment>Server telling client that it is coming back from hover death</comment>
+        <payload dir="server" typename="uint8_t" sizechecktype="none"/>
+    </opcode>
     <opcode id="4195" name="OP_WearChange" updated="06/13/06">
         <comment>old SpawnUpdateCode</comment>
         <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>

[Seq-cvs-commit] showeq/src interface.cpp, 1.76, 1.77 itemdbtool.cpp, 1.12, 1.13 main.cpp, 1.35, 1.36 map.cpp, 1.43, 1.44 player.cpp, 1.53, 1.54 player.h, 1.25, 1.26 spawn.cpp, 1.34, 1.35 spawn.h, 1.21, 1.22 spawnshell.cpp, 1.48, 1.49 spawnshell.h, 1.24, 1.25 spellshell.cpp, 1.13, 1.14

From: Chad M. <cmm...@us...> - 2006-11-04 17:44:12

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3140/src

Modified Files:
	interface.cpp itemdbtool.cpp main.cpp map.cpp player.cpp 
	player.h spawn.cpp spawn.h spawnshell.cpp spawnshell.h 
	spellshell.cpp 
Log Message:

Release 5.6.1.
Better handle hover mode death
Process ZoneEntry for auras as a newSpawn.



Index: player.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/player.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- player.h	30 Sep 2006 21:18:25 -0000	1.25
+++ player.h	4 Nov 2006 17:44:08 -0000	1.26
@@ -96,6 +96,8 @@
    uint16_t defaultRace() const { return m_defaultRace; }
    uint8_t defaultClass() const { return m_defaultClass; }
 
+   virtual void killSpawn();
+
    // ZBTEMP: compatibility code
    uint16_t getPlayerID() const { return id(); }
    int16_t headingDegrees() const { return m_headingDegrees; }

Index: main.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/main.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.cpp	5 Oct 2005 15:29:08 -0000	1.35
+++ main.cpp	4 Nov 2006 17:44:07 -0000	1.36
@@ -13,6 +13,11 @@
 
 #ifdef __linux__
 #include <linux/version.h>
+
+// Newer kernel versions put this in utsversion
+#ifndef UTS_RELEASE
+#include <linux/utsversion.h>
+#endif
 #endif
 
 #include <sys/utsname.h>

Index: spawnshell.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawnshell.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- spawnshell.h	30 Sep 2006 21:18:25 -0000	1.24
+++ spawnshell.h	4 Nov 2006 17:44:08 -0000	1.25
@@ -103,6 +103,7 @@
    void newDoorSpawns(const uint8_t*, size_t, uint8_t);
    void newDoorSpawn(const doorStruct&, size_t, uint8_t);
    void zoneSpawns(const uint8_t* zspawns, size_t len);
+   void zoneEntry(const uint8_t* spawn);
    void newSpawn(const uint8_t* spawn);
    void newSpawn(const spawnStruct& s);
    void playerUpdate(const uint8_t*pupdate, size_t, uint8_t);
@@ -123,6 +124,7 @@
    void consMessage(const uint8_t* con, size_t, uint8_t);
    void deleteSpawn(const uint8_t* delspawn);
    void killSpawn(const uint8_t* deadspawn);
+   void respawnFromHover(const uint8_t* respawn);
    void corpseLoc(const uint8_t* corpseLoc);
 
    void playerChangedID(uint16_t playerID);

Index: spawn.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawn.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- spawn.cpp	30 Sep 2006 21:18:25 -0000	1.34
+++ spawn.cpp	4 Nov 2006 17:44:08 -0000	1.35
@@ -351,38 +351,37 @@
   setConsidered(false);
 }
 
-Spawn::Spawn(Spawn& s, uint16_t id)
-  : Item(tSpawn, id)
+Spawn::Spawn(Spawn* s, uint16_t id) : Item(tSpawn, id)
 {
-  setName(s.name());
-  setLastName(s.lastName());
-  Item::setPoint(s.x(), s.y(), s.z());
-  setPetOwnerID(s.petOwnerID());
-  setLight(s.light());
-  setGender(s.gender());
-  setDeity(s.deity());
-  setRace(s.race());
-  setClassVal(s.classVal());
-  setHP(s.HP());
-  setMaxHP(s.maxHP());
-  setGuildID(s.guildID());
-  setLevel(s.level());
-  for (int i = 0; i <= tLastCoreWearSlot; i++)
-    setEquipment(i, s.equipment(i));
-  setEquipment(tUnknown1, SlotEmpty);
-  setTypeflag(s.typeflag());
-  setGM(s.gm());
-  setNPC(s.NPC());
-  setAnimation(s.animation());
-  setDeltas(s.deltaX(), s.deltaY(), s.deltaZ());
-  setHeading(s.heading(), s.deltaHeading());
-  setConsidered(s.considered());
+    setName(s->name());
+    setLastName(s->lastName());
+    Item::setPoint(s->x(), s->y(), s->z());
+    setPetOwnerID(s->petOwnerID());
+    setLight(s->light());
+    setGender(s->gender());
+    setDeity(s->deity());
+    setRace(s->race());
+    setClassVal(s->classVal());
+    setHP(s->HP());
+    setMaxHP(s->maxHP());
+    setGuildID(s->guildID());
+    setLevel(s->level());
+    for (int i = 0; i <= tLastCoreWearSlot; i++)
+    setEquipment(i, s->equipment(i));
+    setEquipment(tUnknown1, SlotEmpty);
+    setTypeflag(s->typeflag());
+    setGM(s->gm());
+    setNPC(s->NPC());
+    setAnimation(s->animation());
+    setDeltas(s->deltaX(), s->deltaY(), s->deltaZ());
+    setHeading(s->heading(), s->deltaHeading());
+    setConsidered(s->considered());
 
-  // the new copy will own the spawn track list
-  m_spawnTrackList.setAutoDelete(false);
-  m_spawnTrackList = s.m_spawnTrackList;
-  s.m_spawnTrackList.setAutoDelete(false);
-  m_spawnTrackList.setAutoDelete(true);
+    // the new copy will own the spawn track list
+    m_spawnTrackList.setAutoDelete(false);
+    m_spawnTrackList = s->m_spawnTrackList;
+    s->m_spawnTrackList.setAutoDelete(false);
+    m_spawnTrackList.setAutoDelete(true);
 }
 
 Spawn::~Spawn()
@@ -393,11 +392,8 @@
 
 void Spawn::update(const spawnStruct* s)
 {
-  if (m_name.find(Spawn_Corpse_Designator) == -1)
-  {
-    setName(s->name);
-    setLastName(s->lastName);
-  }
+  setName(s->name);
+  setLastName(s->lastName);
 
   setPos(s->x >> 3, s->y >> 3, s->z >> 3);
   setPetOwnerID(s->petOwnerId);

Index: spawn.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawn.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- spawn.h	30 Sep 2006 21:18:25 -0000	1.21
+++ spawn.h	4 Nov 2006 17:44:08 -0000	1.22
@@ -208,7 +208,7 @@
 
   // restore spawn from QDataStream
   Spawn(QDataStream&, uint16_t id);
-  Spawn(Spawn&, uint16_t id);
+  Spawn(Spawn*, uint16_t id);
   virtual ~Spawn();
 
   // save spawn to QDataStream
@@ -297,7 +297,7 @@
   void backfill(const spawnStruct* s);
 
   // change spawn state
-  void killSpawn();
+  virtual void killSpawn();
 
   // spawn specific set methods
   void setDeltas(int16_t deltaX, int16_t deltaY, int16_t deltaZ);

Index: itemdbtool.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/itemdbtool.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- itemdbtool.cpp	13 Sep 2005 15:23:11 -0000	1.12
+++ itemdbtool.cpp	4 Nov 2006 17:44:07 -0000	1.13
@@ -7,6 +7,11 @@
 
 #ifdef __linux__
 #include <linux/version.h>
+
+// Newer kernel versions move this to utsversion.h
+#ifndef UTS_RELEASE
+#include <linux/utsversion.h>
+#endif
 #endif
 
 #include <sys/utsname.h>

Index: spellshell.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spellshell.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- spellshell.cpp	2 Mar 2006 01:03:14 -0000	1.13
+++ spellshell.cpp	4 Nov 2006 17:44:08 -0000	1.14
@@ -468,28 +468,44 @@
 
 void SpellShell::killSpawn(const Item* deceased)
 {
-  uint16_t id = deceased->id();
-  SpellItem* spell;
-
-  if (m_lastPlayerSpell && (m_lastPlayerSpell->targetId() == id))
-    m_lastPlayerSpell = 0;
+    uint16_t id = deceased->id();
 
-  QValueList<SpellItem*>::Iterator it = m_spellList.begin();
-  while(it != m_spellList.end())
-  {
-    spell = *it;
-    if (spell->targetId() == id)
+    if (id == m_player->id())
     {
-      it = m_spellList.remove(it);
-      emit delSpell(spell);
-      delete spell;
+        // We're dead. No more buffs for us.
+        clear();
     }
     else
-      ++it;
-  }
+    {
+        SpellItem* spell;
+
+        if (m_lastPlayerSpell && (m_lastPlayerSpell->targetId() == id))
+        {
+            m_lastPlayerSpell = 0;
+        }
+
+        QValueList<SpellItem*>::Iterator it = m_spellList.begin();
+        while(it != m_spellList.end())
+        {
+            spell = *it;
+            if (spell->targetId() == id)
+            {
+                it = m_spellList.remove(it);
+                emit delSpell(spell);
+                delete spell;
+            }
+            else
+            {
+                ++it;
+            }
+        }
+
+        if (m_spellList.count() == 0)
+        {
+            m_timer->stop();
+        }
+    }
 
-  if (m_spellList.count() == 0)
-    m_timer->stop();
 }
 
 void SpellShell::timeout()

Index: map.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/map.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- map.cpp	18 Sep 2005 04:10:16 -0000	1.43
+++ map.cpp	4 Nov 2006 17:44:07 -0000	1.44
@@ -3037,14 +3037,12 @@
   tmp.setPen (NoPen);
   tmp.setFont (m_param.font());
 
-  if ((m_player->validPos()) ||
-      ((!m_zoneMgr->isZoning()) && 
-       (m_player->id() != 0)))
+  if (m_player->validPos() && !m_zoneMgr->isZoning() && m_player->id() != 0)
   {
     if (m_showPlayerBackground)
       paintPlayerBackground(m_param, tmp);
     
-    if (m_showPlayerView)
+    if (m_showPlayerView && ! m_player->isCorpse())
       paintPlayerView(m_param, tmp);
     
     if (m_showPlayer)
@@ -3186,12 +3184,28 @@
 void Map::paintPlayer(MapParameters& param, QPainter& p)
 {
 #ifdef DEBUGMAP
-  seqDebug("Paint player position");
+    seqDebug("Paint player position");
 #endif
-  p.setPen(gray);
-  p.setBrush(white);
-  p.drawEllipse(m_param.playerXOffset() - 3, 
-        m_param.playerYOffset() - 3, 6, 6);
+
+    if (! m_player->isCorpse())
+    {
+        // White dot for non-corpse
+        p.setPen(gray);
+        p.setBrush(white);
+        p.drawEllipse(m_param.playerXOffset() - 3, 
+            m_param.playerYOffset() - 3, 6, 6);
+    }
+    else
+    {
+        // Corpse icon for a corpse.
+        MapIcon mapIcon = m_mapIcons->icon(tIconTypeSpawnPlayerCorpse);
+
+        p.setPen(mapIcon.highlightPen());
+        p.setBrush(mapIcon.highlightBrush());
+
+        m_mapIcons->paintItemIcon(param, p, mapIcon, m_player,
+            param.playerOffset());
+    }
 }
 
 void Map::paintDrops(MapParameters& param,

Index: player.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/player.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- player.cpp	11 Oct 2006 01:29:42 -0000	1.53
+++ player.cpp	4 Nov 2006 17:44:08 -0000	1.54
@@ -21,7 +21,7 @@
 #include <qdatastream.h>
 
 
-//#define DEBUG_PLAYER
+#define DEBUG_PLAYER
 
 //----------------------------------------------------------------------
 // constants
@@ -192,6 +192,17 @@
   updateLastChanged();
 }
 
+void Player::killSpawn()
+{
+#ifdef DEBUG_PLAYER
+    seqDebug("Player: killSpawn()");
+#endif
+    // We're dead. No buffs for us.
+    
+    // Call our parent.
+    Spawn::killSpawn();
+}
+
 void Player::setUseAutoDetectedSettings(bool enable)
 {
   m_useAutoDetectedSettings = enable;

Index: interface.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/interface.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- interface.cpp	30 Sep 2006 21:18:24 -0000	1.76
+++ interface.cpp	4 Nov 2006 17:44:07 -0000	1.77
@@ -1986,9 +1986,9 @@
    m_packet->connect2("OP_NewSpawn", SP_Zone, DIR_Server,
 		      "spawnStruct", SZC_Match,
 		      m_spawnShell, SLOT(newSpawn(const uint8_t*)));
-//   m_packet->connect2("OP_ZoneEntry", SP_Zone, DIR_Server,
-//		      "ServerZoneEntryStruct", SZC_Match,
-//		      m_spawnShell, SLOT(newSpawn(const uint8_t*)));
+   m_packet->connect2("OP_ZoneEntry", SP_Zone, DIR_Server,
+		      "ServerZoneEntryStruct", SZC_Match,
+		      m_spawnShell, SLOT(zoneEntry(const uint8_t*)));
    m_packet->connect2("OP_MobUpdate", SP_Zone, DIR_Server|DIR_Client,
 		      "spawnPositionUpdate", SZC_Match,
 		      m_spawnShell, SLOT(updateSpawns(const uint8_t*)));
@@ -2013,6 +2013,9 @@
    m_packet->connect2("OP_Death", SP_Zone, DIR_Server,
 		      "newCorpseStruct", SZC_Match,
 		      m_spawnShell, SLOT(killSpawn(const uint8_t*)));
+   m_packet->connect2("OP_RespawnFromHover", SP_Zone, DIR_Server,
+		      "uint8_t", SZC_None,
+		      m_spawnShell, SLOT(respawnFromHover(const uint8_t*)));
    m_packet->connect2("OP_Shroud", SP_Zone, DIR_Server,
               "spawnShroudSelf", SZC_None,
               m_spawnShell, SLOT(shroudSpawn(const uint8_t*, size_t, uint8_t)));

Index: spawnshell.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- spawnshell.cpp	30 Sep 2006 21:18:25 -0000	1.48
+++ spawnshell.cpp	4 Nov 2006 17:44:08 -0000	1.49
@@ -481,6 +481,32 @@
   }
 }
 
+void SpawnShell::zoneEntry(const uint8_t* data)
+{
+    const spawnStruct* spawn = (const spawnStruct*)data;
+
+#ifdef SPAWNSHELL_DIAG
+    seqDebug("SpawnShell::zoneEntry(spawnStruct *(name='%s'))", spawn->name);
+#endif
+
+    // Zone Entry. This is a semi-filled in spawnStruct that we
+    // see for ourself when entering a zone. We also get sent this
+    // when shrouding and when respawning from corpse hover mode. Auras
+    // also get sent this sometimes.
+    if (spawn->NPC == 0)
+    {
+        // Align the player instance with these values
+        m_player->update(spawn);
+
+        emit changeItem(m_player, tSpawnChangedALL);
+    }
+    else
+    {
+        // Auras.
+        newSpawn(data);
+    }
+}
+
 void SpawnShell::newSpawn(const uint8_t* data)
 {
   // if zoning, then don't do anything
@@ -589,8 +615,7 @@
 
   const playerSpawnPosStruct *pupdate = (const playerSpawnPosStruct *)data;
 
-  if ((dir != DIR_Client) && 
-      (pupdate->spawnId != m_player->id())) // PC Corpse Movement
+  if (dir != DIR_Client)
   {
     int16_t y = pupdate->y >> 3;
     int16_t x = pupdate->x >> 3;
@@ -757,63 +782,77 @@
 			     uint8_t animation)
 {
 #ifdef SPAWNSHELL_DIAG
-   seqDebug("SpawnShell::updateSpawn(id=%d, x=%d, y=%d, z=%d, xVel=%d, yVel=%d, zVel=%d)", id, x, y, z, xVel, yVel, zVel);
+    seqDebug("SpawnShell::updateSpawn(id=%d, x=%d, y=%d, z=%d, xVel=%d, yVel=%d, zVel=%d)", 
+        id, x, y, z, xVel, yVel, zVel);
 #endif
 
-   Item* item = m_spawns.find(id);
+    Item* item;
+   
+    if (id == m_player->id())
+    {
+        item = m_player;
+    }
+    else
+    {
+        item = m_spawns.find(id);
+    }
 
-   if (item != NULL)
-   {
-     Spawn* spawn = (Spawn*)item;
+    if (item != NULL)
+    {
+        Spawn* spawn = (Spawn*)item;
 
-     spawn->setPos(x, y, z,
-		   showeq_params->walkpathrecord,
-		   showeq_params->walkpathlength);
-     spawn->setAnimation(animation);
+        spawn->setPos(x, y, z,
+		    showeq_params->walkpathrecord,
+		    showeq_params->walkpathlength);
+        spawn->setAnimation(animation);
 
-     spawn->setDeltas(xVel, yVel, zVel);
-     spawn->setHeading(heading, deltaHeading);
+        spawn->setDeltas(xVel, yVel, zVel);
+        spawn->setHeading(heading, deltaHeading);
 
-     // Distance
-     if (!showeq_params->fast_machine)
-        item->setDistanceToPlayer(m_player->calcDist2DInt(*item));
-     else
-        item->setDistanceToPlayer(m_player->calcDist(*item));
+        // Distance
+        if (!showeq_params->fast_machine)
+            item->setDistanceToPlayer(m_player->calcDist2DInt(*item));
+        else
+            item->setDistanceToPlayer(m_player->calcDist(*item));
         
-     spawn->updateLast();
-     item->updateLastChanged();
-     emit changeItem(item, tSpawnChangedPosition);
-   }
-   else if (showeq_params->createUnknownSpawns)
-   {
-     // not the player, so check if it's a recently deleted spawn
-     for (int i =0; i < m_cntDeadSpawnIDs; i++)
-     {
-       // check dead spawn list for spawnID, if it was deleted, shouldn't
-       // see new position updates, so therefore this is probably 
-       // for a new spawn (spawn ID being reused)
-       if ((m_deadSpawnID[i] != 0) && (m_deadSpawnID[i] == id))
-       {
-	 // found a match, ignore it
-	 m_deadSpawnID[i] = 0;
+        spawn->updateLast();
+        item->updateLastChanged();
+        emit changeItem(item, tSpawnChangedPosition);
+    }
+    else if (showeq_params->createUnknownSpawns)
+    {
+        // not the player, so check if it's a recently deleted spawn
+        for (int i =0; i < m_cntDeadSpawnIDs; i++)
+        {
+            // check dead spawn list for spawnID, if it was deleted, shouldn't
+            // see new position updates, so therefore this is probably 
+            // for a new spawn (spawn ID being reused)
+            if ((m_deadSpawnID[i] != 0) && (m_deadSpawnID[i] == id))
+            {
+                // found a match, ignore it
+                m_deadSpawnID[i] = 0;
 
-	 seqInfo("(%d) had been removed from the zone, but saw a position update on it, so assuming bogus update.", 
-		id);
+                seqInfo("(%d) had been removed from the zone, but saw a position update on it, so assuming bogus update.", 
+                    id);
 
-	 return;
-       }
-     }
+                return;
+            }
+        }
 
-     item = new Spawn(id, x, y, z, xVel, yVel, zVel, 
-		      heading, deltaHeading, animation);
-     updateFilterFlags(item);
-     updateRuntimeFilterFlags(item);
-     m_spawns.insert(id, item);
-     emit addItem(item);
+        item = new Spawn(id, x, y, z, xVel, yVel, zVel, 
+            heading, deltaHeading, animation);
+        updateFilterFlags(item);
+        updateRuntimeFilterFlags(item);
+        m_spawns.insert(id, item);
+        emit addItem(item);
 
-     // send notification of new spawn count
-     emit numSpawns(m_spawns.count());
-   }
+#ifdef SPAWNSHELL_DIAG
+        seqDebug("SpawnShell::updateSpawn created unknown spawn (id=%u)", id);
+#endif
+
+        // send notification of new spawn count
+        emit numSpawns(m_spawns.count());
+    }
 }
 
 void SpawnShell::updateSpawns(const uint8_t* data)
@@ -1099,7 +1138,15 @@
 #endif
    Item* item;
 
-   item = m_spawns.find(deadspawn->spawnId);
+   if (deadspawn->spawnId != m_player->id())
+   {
+       item = m_spawns.find(deadspawn->spawnId);
+   }
+   else
+   {
+       item = m_player;
+   }
+
    if (item != NULL)
    {
      Spawn* spawn = (Spawn*)item;
@@ -1119,6 +1166,43 @@
    }
 }
 
+void SpawnShell::respawnFromHover(const uint8_t* data)
+{
+#ifdef SPAWNSHELL_DIAG
+    seqDebug("SpawnShell::respawnFromHover()");
+#endif
+
+    // Our old player is a corpse, but we're rising from the dead. So
+    // we need to pop a corpse to represent our deadselves, invalidate
+    // the player, and then let the OP_ZoneEntry that is coming for the repop
+    // fix the player.
+    uint16_t corpseId = m_player->id();
+
+    // invalidate the player by severing it from its Id.
+    m_player->setID(0);
+
+    // Pop a corpse
+    Spawn* corpse = new Spawn((Spawn*) m_player, corpseId);
+
+    updateFilterFlags(corpse);
+    updateRuntimeFilterFlags(corpse);
+    m_spawns.insert(corpse->id(), corpse);
+
+    if (corpse->guildID() < MAX_GUILDS)
+    {
+        corpse->setGuildTag(m_guildMgr->guildIdToName(corpse->guildID()));
+    }
+    else
+    {
+        corpse->setGuildTag("");
+    }
+
+    emit addItem(corpse);
+
+    // send notification of new spawn count
+    emit numSpawns(m_spawns.count());
+}
+
 void SpawnShell::corpseLoc(const uint8_t* data)
 {
   const corpseLocStruct* corpseLoc = (const corpseLocStruct*)data;

[Seq-cvs-commit] showeq ChangeLog, 1.26, 1.27 configure.in, 1.69, 1.70

From: Chad M. <cmm...@us...> - 2006-11-04 17:44:12

Update of /cvsroot/seq/showeq
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3140

Modified Files:
	ChangeLog configure.in 
Log Message:

Release 5.6.1.
Better handle hover mode death
Process ZoneEntry for auras as a newSpawn.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/seq/showeq/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	11 Oct 2006 01:29:42 -0000	1.26
+++ ChangeLog	4 Nov 2006 17:44:06 -0000	1.27
@@ -1,9 +1,16 @@
 Version: $Id$ $Name$
 
-purple (10/10/06)
+purple (11/04/06)
 -----------------
++ Updated version to 5.6.1
 + Fixed con range. Stupid double ++ error.
 + Redid gradients for red con colors
++ Cleaned up the hover-mode death handling by making movements valid, changing
+	icon to a corpse, and made handling the respawn not cause unknowns
++ Added a hack for kernel versions after 2.6.18 that moved UTS_RELEASE
++ Fixed auras so they shouldn't show up unknown as much. New auras for people
+	who are not in your group will still show as unknown, since the server
+	doesn't announce them until you join the group.
 
 purple (9/30/06)
 ----------------

Index: configure.in
===================================================================
RCS file: /cvsroot/seq/showeq/configure.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- configure.in	30 Sep 2006 21:18:23 -0000	1.69
+++ configure.in	4 Nov 2006 17:44:06 -0000	1.70
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.6.0.0)
+AC_INIT(showeq, 5.6.1.0)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CANONICAL_SYSTEM

Flat | Threaded

<< < 1 .. 36 37 38 39 40 .. 47 > >> (Page 38 of 47)