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
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <iea...@us...> - 2010-02-20 23:04:45
|
Revision: 751 http://seq.svn.sourceforge.net/seq/?rev=751&view=rev Author: ieatacid Date: 2010-02-20 23:04:38 +0000 (Sat, 20 Feb 2010) Log Message: ----------- Tag for release 5.13.10.0 Added Paths: ----------- showeq/tags/v5_13_10_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2010-02-20 23:01:53
|
Revision: 750 http://seq.svn.sourceforge.net/seq/?rev=750&view=rev Author: ieatacid Date: 2010-02-20 23:01:46 +0000 (Sat, 20 Feb 2010) Log Message: ----------- Fixed structs + Fixed code to handle serialized makeDrop struct + Added new item codes + Version to 5.13.10 Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/conf/zoneopcodes.xml showeq/trunk/configure.in showeq/trunk/src/everquest.h showeq/trunk/src/interface.cpp showeq/trunk/src/main.cpp showeq/trunk/src/spawnshell.cpp showeq/trunk/src/weapons29.h showeq/trunk/src/weapons2a.h showeq/trunk/src/weapons2b.h showeq/trunk/src/weapons2c.h showeq/trunk/src/weapons2d.h Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/ChangeLog 2010-02-20 23:01:46 UTC (rev 750) @@ -1,3 +1,10 @@ +ieatacid (2/20/09) +----------------- +- Updated version to 5.13.10 +- Fixed structs +- Fixed code to handle serialized makeDrop struct +- Added new item codes (uRit1u2CBBA=) + ieatacid (12/25/09) ----------------- - Updated version to 5.13.9.1 Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/conf/zoneopcodes.xml 2010-02-20 23:01:46 UTC (rev 750) @@ -179,7 +179,7 @@ </opcode> <opcode id="5C85" name="OP_GroundSpawn" updated="06/12/09"> <comment>old MakeDropCode</comment> - <payload dir="server" typename="makeDropStruct" sizechecktype="match"/> + <payload dir="server" typename="makeDropStruct" sizechecktype="none"/> <payload dir="client" typename="uint8_t" sizechecktype="none"/> </opcode> <opcode id="0555" name="OP_ExpUpdate" updated="06/12/09"> Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/configure.in 2010-02-20 23:01:46 UTC (rev 750) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.9.1) +AC_INIT(showeq, 5.13.10.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/everquest.h 2010-02-20 23:01:46 UTC (rev 750) @@ -425,7 +425,7 @@ /* ** Buffs -** Length: 28 Octets +** Length: 32 Octets ** Used in: ** charProfileStruct(07012) */ @@ -435,13 +435,14 @@ /*0001*/ int8_t level; // Level of person who cast buff /*0002*/ uint8_t unknown0002; // /*0003*/ uint8_t unknown0003; // -/*0004*/ int32_t spellid; // Spell -/*0008*/ int32_t duration; // Time remaining in ticks -/*0012*/ int32_t effect; // holds the dmg absorb amount on runes -/*0016*/ uint8_t unknown0016[4]; // *** this might need to be swapped with playerId -/*0020*/ uint32_t playerId; // Global id of caster (for wear off) -/*0024*/ uint8_t unknown0024[4]; -/*0028*/ +/*0004*/ float unknown0004; +/*0008*/ int32_t spellid; // Spell +/*0012*/ int32_t duration; // Time remaining in ticks +/*0016*/ int32_t effect; // holds the dmg absorb amount on runes +/*0020*/ uint8_t unknown0020[4]; // *** this might need to be swapped with playerId +/*0024*/ uint32_t playerId; // Global id of caster (for wear off) +/*0028*/ uint8_t unknown0028[4]; +/*0032*/ }; @@ -1959,12 +1960,13 @@ /*0000*/ uint16_t target; // Target ID /*0002*/ uint16_t source; // SourceID /*0004*/ uint8_t level; // Caster level -/*0005*/ uint8_t unknown0005[17]; // ***Placeholder -/*0022*/ uint8_t type; // Casts, Falls, Bashes, etc... -/*0023*/ int32_t damage; // Amount of Damage -/*0027*/ int16_t spell; // SpellID -/*0029*/ uint8_t unknown0029[2]; // ***Placeholder -/*0031*/ +/*0005*/ uint8_t unknown0005[21]; // ***Placeholder +/*0026*/ uint8_t type; // Casts, Falls, Bashes, etc... +/*0027*/ int32_t damage; // Amount of Damage +/*0031*/ uint8_t unknown0031[2]; +/*0033*/ int16_t spell; // SpellID +/*0035*/ uint8_t unknown0035[2]; // ***Placeholder +/*0037*/ }; // Starting with 2/21/2006, OP_Actions seem to come in pairs, duplicating @@ -1975,14 +1977,15 @@ /*0000*/ uint16_t target; // Target ID /*0002*/ uint16_t source; // SourceID /*0004*/ uint8_t level; // Caster level -/*0005*/ uint8_t unknown0005[17]; // ***Placeholder -/*0022*/ uint8_t type; // Casts, Falls, Bashes, etc... -/*0023*/ int32_t damage; // Amount of Damage -/*0027*/ int16_t spell; // SpellID -/*0029*/ uint8_t unknown0029[2]; // ***Placeholder -/*0031*/ uint32_t unknown0031; -/*0035*/ uint8_t unknown0035[21]; -/*0056*/ +/*0005*/ uint8_t unknown0005[21]; // ***Placeholder +/*0026*/ uint8_t type; // Casts, Falls, Bashes, etc... +/*0027*/ int32_t damage; // Amount of Damage +/*0031*/ uint8_t unknown0031[2]; +/*0033*/ int16_t spell; // SpellID +/*0035*/ uint8_t unknown0035[2]; // ***Placeholder +/*0037*/ uint32_t unknown0037; +/*0041*/ uint8_t unknown0041[23]; +/*0064*/ }; /* @@ -2499,14 +2502,15 @@ { /*0000*/ uint32_t spawnid; //spawn id /*0004*/ uint8_t unknown0004[4]; -/*0008*/ uint32_t spellid; // spellid -/*0012*/ uint32_t duration; // duration -/*0016*/ uint8_t unknown0012[8]; -/*0024*/ uint32_t playerId; // Player id who cast the buff -/*0028*/ uint8_t unknown0028[4]; -/*0032*/ uint32_t spellslot; // spellslot -/*0036*/ uint32_t changetype; // 1=buff fading,2=buff duration -/*0040*/ +/*0008*/ float unknown0008; +/*0012*/ uint32_t spellid; // spellid +/*0016*/ uint32_t duration; // duration +/*0024*/ uint8_t unknown0024[8]; +/*0028*/ uint32_t playerId; // Player id who cast the buff +/*0032*/ uint8_t unknown0032[4]; +/*0036*/ uint32_t spellslot; // spellslot +/*0040*/ uint32_t changetype; // 1=buff fading,2=buff duration +/*0044*/ }; /* Modified: showeq/trunk/src/interface.cpp =================================================================== --- showeq/trunk/src/interface.cpp 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/interface.cpp 2010-02-20 23:01:46 UTC (rev 750) @@ -1949,7 +1949,7 @@ // connect the SpawnShell slots to Packet signals m_packet->connect2("OP_GroundSpawn", SP_Zone, DIR_Server, - "makeDropStruct", SZC_Match, + "makeDropStruct", SZC_None, m_spawnShell, SLOT(newGroundItem(const uint8_t*, size_t, uint8_t))); m_packet->connect2("OP_ClickObject", SP_Zone, DIR_Server, "remDropStruct", SZC_Match, Modified: showeq/trunk/src/main.cpp =================================================================== --- showeq/trunk/src/main.cpp 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/main.cpp 2010-02-20 23:01:46 UTC (rev 750) @@ -736,7 +736,7 @@ { printf ("ShowEQ %s, released under the GPL.\n", VERSION); printf (" SINS 0.5, released under the GPL.\n"); - printf ("All ShowEQ source code is Copyright (C) 2000-2005 by the respective ShowEQ Developers\n"); + printf ("All ShowEQ source code is Copyright (C) 2000-2010 by the respective ShowEQ Developers\n"); printf ("ShowEQ comes with NO WARRANTY.\n\n"); Modified: showeq/trunk/src/spawnshell.cpp =================================================================== --- showeq/trunk/src/spawnshell.cpp 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/spawnshell.cpp 2010-02-20 23:01:46 UTC (rev 750) @@ -319,27 +319,73 @@ } // same-name slots, connecting to Packet signals -void SpawnShell::newGroundItem(const uint8_t* data, size_t, uint8_t dir) +// this packet is variable in length. everything is dwords except the "idFile" field +// which can be variable +void SpawnShell::newGroundItem(const uint8_t* data, size_t len, uint8_t dir) { - const makeDropStruct *d = (const makeDropStruct *)data; + if (m_zoneMgr->isZoning()) + return; + + if (dir != DIR_Server) + return; + + if (!data) + return; + + NetStream netStream(data, len); + makeDropStruct ds; + QString name; + union { uint32_t n; float f; } x; + + // read drop id + ds.dropId = netStream.readUInt32NC(); + + // read name + name = netStream.readText(); + strcpy(ds.idFile, name.latin1()); + + // read past zone id + netStream.readUInt32NC(); + + // read past zone instance + netStream.readUInt32NC(); + + // read past unknown dword field + netStream.readUInt32NC(); + + // read heading + x.n = netStream.readUInt32NC(); + ds.heading = x.f; + + // read past unknown dword field + netStream.readUInt32NC(); + + // read past unknown dword field + netStream.readUInt32NC(); + + // read past unknown dword field + netStream.readUInt32NC(); + + // read y pos + x.n = netStream.readUInt32NC(); + ds.y = x.f; + + // read x pos + x.n = netStream.readUInt32NC(); + ds.x = x.f; + + // read z pos + x.n = netStream.readUInt32NC(); + ds.z = x.f; + #ifdef SPAWNSHELL_DIAG seqDebug("SpawnShell::newGroundItem(makeDropStruct *)"); #endif - // if zoning, then don't do anything - if (m_zoneMgr->isZoning()) - return; - if (dir != DIR_Server) - return; - - if (!d) - return; - - QString name; - Drop* item = (Drop*)m_drops.find(d->dropId); + Drop* item = (Drop*)m_drops.find(ds.dropId); if (item != NULL) { - item->update(d, name); + item->update(&ds, name); if (!showeq_params->fast_machine) item->setDistanceToPlayer(m_player->calcDist2DInt(*item)); else @@ -350,13 +396,13 @@ } else { - item = new Drop(d, name); + item = new Drop(&ds, name); if (!showeq_params->fast_machine) item->setDistanceToPlayer(m_player->calcDist2DInt(*item)); else item->setDistanceToPlayer(m_player->calcDist(*item)); updateFilterFlags(item); - m_drops.insert(d->dropId, item); + m_drops.insert(ds.dropId, item); emit addItem(item); } } Modified: showeq/trunk/src/weapons29.h =================================================================== --- showeq/trunk/src/weapons29.h 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/weapons29.h 2010-02-20 23:01:46 UTC (rev 750) @@ -29,7 +29,7 @@ NULL, // 0x14 NULL, // 0x15 NULL, // 0x16 - NULL, // 0x17 + "Hammer", // 0x17 NULL, // 0x18 NULL, // 0x19 NULL, // 0x1a @@ -241,7 +241,7 @@ NULL, // 0xe8 NULL, // 0xe9 NULL, // 0xea - NULL, // 0xeb + "Wand", // 0xeb NULL, // 0xec NULL, // 0xed NULL, // 0xee Modified: showeq/trunk/src/weapons2a.h =================================================================== --- showeq/trunk/src/weapons2a.h 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/weapons2a.h 2010-02-20 23:01:46 UTC (rev 750) @@ -44,7 +44,7 @@ NULL, // 0x23 NULL, // 0x24 NULL, // 0x25 - NULL, // 0x26 + "Shield", // 0x26 NULL, // 0x27 NULL, // 0x28 NULL, // 0x29 @@ -164,7 +164,7 @@ NULL, // 0x9b NULL, // 0x9c NULL, // 0x9d - NULL, // 0x9e + "Sabre", // 0x9e NULL, // 0x9f NULL, // 0xa0 NULL, // 0xa1 Modified: showeq/trunk/src/weapons2b.h =================================================================== --- showeq/trunk/src/weapons2b.h 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/weapons2b.h 2010-02-20 23:01:46 UTC (rev 750) @@ -181,13 +181,13 @@ NULL, // 0xac NULL, // 0xad NULL, // 0xae - NULL, // 0xaf + "Shield", // 0xaf NULL, // 0xb0 NULL, // 0xb1 NULL, // 0xb2 NULL, // 0xb3 NULL, // 0xb4 - NULL, // 0xb5 + "Shield", // 0xb5 NULL, // 0xb6 NULL, // 0xb7 NULL, // 0xb8 Modified: showeq/trunk/src/weapons2c.h =================================================================== --- showeq/trunk/src/weapons2c.h 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/weapons2c.h 2010-02-20 23:01:46 UTC (rev 750) @@ -44,7 +44,7 @@ NULL, // 0x23 NULL, // 0x24 NULL, // 0x25 - NULL, // 0x26 + "Hammer", // 0x26 NULL, // 0x27 NULL, // 0x28 NULL, // 0x29 @@ -88,7 +88,7 @@ NULL, // 0x4f NULL, // 0x50 NULL, // 0x51 - NULL, // 0x52 + "Dagger", // 0x52 NULL, // 0x53 NULL, // 0x54 NULL, // 0x55 Modified: showeq/trunk/src/weapons2d.h =================================================================== --- showeq/trunk/src/weapons2d.h 2009-12-25 19:12:20 UTC (rev 749) +++ showeq/trunk/src/weapons2d.h 2010-02-20 23:01:46 UTC (rev 750) @@ -72,7 +72,7 @@ NULL, // 0x3f NULL, // 0x40 NULL, // 0x41 - NULL, // 0x42 + "Dagger", // 0x42 NULL, // 0x43 NULL, // 0x44 NULL, // 0x45 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-12-25 19:12:30
|
Revision: 749 http://seq.svn.sourceforge.net/seq/?rev=749&view=rev Author: ieatacid Date: 2009-12-25 19:12:20 +0000 (Fri, 25 Dec 2009) Log Message: ----------- Tag for release 5.13.9.1 Added Paths: ----------- showeq/tags/v5_13_9_1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-12-25 19:08:15
|
Revision: 748 http://seq.svn.sourceforge.net/seq/?rev=748&view=rev Author: ieatacid Date: 2009-12-25 19:08:08 +0000 (Fri, 25 Dec 2009) Log Message: ----------- Version to 5.13.9.1 Modified Paths: -------------- showeq/trunk/ChangeLog Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-12-25 19:00:49 UTC (rev 747) +++ showeq/trunk/ChangeLog 2009-12-25 19:08:08 UTC (rev 748) @@ -1,5 +1,6 @@ ieatacid (12/25/09) ----------------- +- Updated version to 5.13.9.1 - Fixed buffStruct and newZoneStruct - Added weapons2d.h to automake This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-12-25 19:01:00
|
Revision: 747 http://seq.svn.sourceforge.net/seq/?rev=747&view=rev Author: ieatacid Date: 2009-12-25 19:00:49 +0000 (Fri, 25 Dec 2009) Log Message: ----------- Fixed buffStruct and newZoneStruct + Added weapons2d.h to automake Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/configure.in showeq/trunk/src/Makefile.am showeq/trunk/src/everquest.h Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-12-20 19:54:51 UTC (rev 746) +++ showeq/trunk/ChangeLog 2009-12-25 19:00:49 UTC (rev 747) @@ -1,3 +1,8 @@ +ieatacid (12/25/09) +----------------- +- Fixed buffStruct and newZoneStruct +- Added weapons2d.h to automake + ieatacid (12/20/09) ----------------- - Updated version to 5.13.9 Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-12-20 19:54:51 UTC (rev 746) +++ showeq/trunk/configure.in 2009-12-25 19:00:49 UTC (rev 747) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.9.0) +AC_INIT(showeq, 5.13.9.1) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/Makefile.am =================================================================== --- showeq/trunk/src/Makefile.am 2009-12-20 19:54:51 UTC (rev 746) +++ showeq/trunk/src/Makefile.am 2009-12-25 19:00:49 UTC (rev 747) @@ -111,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 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 +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 weapons2d.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/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-12-20 19:54:51 UTC (rev 746) +++ showeq/trunk/src/everquest.h 2009-12-25 19:00:49 UTC (rev 747) @@ -567,7 +567,7 @@ /* ** New Zone Code -** Length: 924 Octets +** Length: 944 Octets ** OpCode: NewZoneCode */ struct newZoneStruct @@ -608,7 +608,8 @@ /*0924*/ uint8_t unknown0924[4]; // *** Placeholder (09/03/2008) /*0928*/ uint8_t unknown0928[4]; // *** Placeholder (10/07/2008) /*0932*/ uint8_t unknown0932[8]; // *** Placeholder (11/04/2009) -/*0940*/ +/*0940*/ uint8_t unknown0940[4]; // *** Placeholder (12/15/2009) +/*0944*/ }; /* @@ -727,7 +728,7 @@ /* ** Player Profile -** Length: 24856 Octets +** Length: 25184 Octets ** OpCode: CharProfileCode */ struct charProfileStruct @@ -2502,9 +2503,10 @@ /*0012*/ uint32_t duration; // duration /*0016*/ uint8_t unknown0012[8]; /*0024*/ uint32_t playerId; // Player id who cast the buff -/*0028*/ uint32_t spellslot; // spellslot -/*0032*/ uint32_t changetype; // 1=buff fading,2=buff duration -/*0034*/ +/*0028*/ uint8_t unknown0028[4]; +/*0032*/ uint32_t spellslot; // spellslot +/*0036*/ uint32_t changetype; // 1=buff fading,2=buff duration +/*0040*/ }; /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-12-20 19:55:01
|
Revision: 746 http://seq.svn.sourceforge.net/seq/?rev=746&view=rev Author: ieatacid Date: 2009-12-20 19:54:51 +0000 (Sun, 20 Dec 2009) Log Message: ----------- Modified Paths: -------------- showeq/trunk/src/weapons2d.h Modified: showeq/trunk/src/weapons2d.h =================================================================== --- showeq/trunk/src/weapons2d.h 2009-12-20 18:29:59 UTC (rev 745) +++ showeq/trunk/src/weapons2d.h 2009-12-20 19:54:51 UTC (rev 746) @@ -1,5 +1,5 @@ /* - * weapons2c.h + * weapons2d.h * * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-12-20 18:30:07
|
Revision: 745 http://seq.svn.sourceforge.net/seq/?rev=745&view=rev Author: ieatacid Date: 2009-12-20 18:29:59 +0000 (Sun, 20 Dec 2009) Log Message: ----------- Tag for release 5.13.9.0 Added Paths: ----------- showeq/tags/v5_13_9_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-12-20 18:28:47
|
Revision: 744 http://seq.svn.sourceforge.net/seq/?rev=744&view=rev Author: ieatacid Date: 2009-12-20 18:28:40 +0000 (Sun, 20 Dec 2009) Log Message: ----------- charProfile updated + New zones added + New races added + New item codes added + Version to 5.13.9 Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/configure.in showeq/trunk/src/everquest.h showeq/trunk/src/interface.cpp showeq/trunk/src/races.h showeq/trunk/src/spawn.cpp showeq/trunk/src/weapons2c.h showeq/trunk/src/zones.h Added Paths: ----------- showeq/trunk/src/weapons2d.h Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/ChangeLog 2009-12-20 18:28:40 UTC (rev 744) @@ -1,3 +1,10 @@ +ieatacid (12/20/09) +----------------- +- Updated version to 5.13.9 +- Updated charProfile struct +- New zones added to zones.h +- New races and item codes added (uRit1u2CBBA) + ieatacid (10/26/09) ----------------- - Updated version to 5.13.8 Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/configure.in 2009-12-20 18:28:40 UTC (rev 744) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.8.0) +AC_INIT(showeq, 5.13.9.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/src/everquest.h 2009-12-20 18:28:40 UTC (rev 744) @@ -102,14 +102,14 @@ //Maximum limits of certain types of data #define MAX_KNOWN_SKILLS 100 -#define MAX_SPELL_SLOTS 10 +#define MAX_SPELL_SLOTS 12 #define MAX_KNOWN_LANGS 25 #define MAX_SPELLBOOK_SLOTS 400 #define MAX_GROUP_MEMBERS 6 #define MAX_BUFFS 30 #define MAX_GUILDS 1500 #define MAX_AA 300 -#define MAX_BANDOLIERS 20 +#define MAX_BANDOLIERS 20 #define MAX_POTIONS_IN_BELT 5 #define MAX_TRIBUTES 5 #define MAX_DISCIPLINES 100 @@ -425,7 +425,7 @@ /* ** Buffs -** Length: 24 Octets +** Length: 28 Octets ** Used in: ** charProfileStruct(07012) */ @@ -440,7 +440,8 @@ /*0012*/ int32_t effect; // holds the dmg absorb amount on runes /*0016*/ uint8_t unknown0016[4]; // *** this might need to be swapped with playerId /*0020*/ uint32_t playerId; // Global id of caster (for wear off) -/*0024*/ +/*0024*/ uint8_t unknown0024[4]; +/*0028*/ }; @@ -606,7 +607,8 @@ /*0920*/ uint8_t unknown0920[4]; // *** Placeholder (01/17/2008) /*0924*/ uint8_t unknown0924[4]; // *** Placeholder (09/03/2008) /*0928*/ uint8_t unknown0928[4]; // *** Placeholder (10/07/2008) -/*0932*/ +/*0932*/ uint8_t unknown0932[8]; // *** Placeholder (11/04/2009) +/*0940*/ }; /* @@ -691,7 +693,7 @@ /*04189*/ uint8_t unknown04189[175]; /*04364*/ int32_t sSpellBook[720]; // List of the Spells in spellbook /*07244*/ int32_t sMemSpells[MAX_SPELL_SLOTS]; // List of spells memorized -/*07284*/ uint8_t unknown07284[28]; +/*07292*/ uint8_t unknown07292[20]; /*07312*/ uint32_t platinum; // Platinum Pieces on player /*07316*/ uint32_t gold; // Gold Pieces on player /*07320*/ uint32_t silver; // Silver Pieces on player @@ -702,22 +704,25 @@ /*07340*/ uint32_t copper_cursor; // Copper Pieces on cursor /*07344*/ uint32_t skills[MAX_KNOWN_SKILLS]; // List of skills /*07744*/ uint32_t innateSkills[25]; -/*07844*/ uint8_t unknown07844[36]; -/*07880*/ uint32_t toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) -/*07884*/ uint32_t thirst; // Drink (ticks till next drink) -/*07888*/ uint32_t hunger; // Food (ticks till next eat) +/*07844*/ uint8_t unknown07844[16]; +/*07860*/ uint32_t toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) +/*07864*/ uint32_t thirst; // Drink (ticks till next drink) +/*07868*/ uint32_t hunger; // Food (ticks till next eat) +/*07872*/ uint8_t unknown07872[20]; /*07892*/ spellBuff buffs[MAX_BUFFS]; // Buffs currently on the player -/*08612*/ uint32_t disciplines[MAX_DISCIPLINES]; // Known disciplines -/*09012*/ uint8_t unknown09012[560]; -/*09572*/ uint32_t recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use) -/*09652*/ uint32_t endurance; // Current endurance -/*09656*/ uint32_t aa_spent; // Number of spent AA points -/*09660*/ uint32_t aa_unspent; // Unspent AA points -/*09664*/ uint8_t unknown09664[4]; -/*09668*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents -/*16068*/ InlineItem potionBelt[MAX_POTIONS_IN_BELT]; // potion belt -/*16428*/ uint8_t unknown16428[92]; -/*16520*/ +/*08732*/ uint32_t disciplines[MAX_DISCIPLINES]; // Known disciplines +/*09132*/ uint8_t unknown09132[560]; +/*09692*/ uint32_t recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use) +/*09772*/ uint32_t endurance; // Current endurance +/*09776*/ uint32_t aa_spent; // Number of spent AA points (including glyphs) +/*09780*/ uint32_t aa_assigned; // Number of points currently assigned to AAs +/*09784*/ uint32_t unknown09784[4]; +/*09800*/ uint32_t aa_unspent; // Unspent AA points +/*09804*/ uint8_t unknown09804[4]; +/*09808*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents +/*16208*/ InlineItem potionBelt[MAX_POTIONS_IN_BELT]; // potion belt +/*16568*/ uint8_t unknown16568[92]; +/*16660*/ }; /* @@ -729,81 +734,81 @@ { /*00000*/ uint32_t checksum; // /*00004*/ playerProfileStruct profile; // Profile -/*16520*/ char name[64]; // Name of player -/*16584*/ char lastName[32]; // Last name of player -/*16616*/ uint8_t unknown16616[12]; //***Placeholder (1/18/2006) -/*16628*/ int32_t guildID; // guildID -/*16632*/ uint32_t birthdayTime; // character birthday -/*16636*/ uint32_t lastSaveTime; // character last save time -/*16640*/ uint32_t timePlayedMin; // time character played -/*16644*/ uint8_t unknown16644[4]; -/*16648*/ uint8_t pvp; // 1=pvp, 0=not pvp -/*16649*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon -/*16650*/ uint8_t gm; // 0=no, 1=yes (guessing!) -/*16651*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader -/*16652*/ uint8_t unknown16652[8]; -/*16660*/ uint32_t exp; // Current Experience -/*16664*/ uint8_t unknown16664[12]; -/*16676*/ uint8_t languages[MAX_KNOWN_LANGS]; // List of languages -/*16701*/ uint8_t unknown16701[7]; // All 0x00 (language buffer?) -/*16708*/ float y; // Players y position -/*16712*/ float x; // Players x position -/*16716*/ float z; // Players z position -/*16720*/ float heading; // Players heading -/*16724*/ uint32_t standState; // 0x64 = stand -/*16728*/ uint32_t platinum_bank; // Platinum Pieces in Bank -/*16732*/ uint32_t gold_bank; // Gold Pieces in Bank -/*16736*/ uint32_t silver_bank; // Silver Pieces in Bank -/*16740*/ uint32_t copper_bank; // Copper Pieces in Bank -/*16744*/ uint32_t platinum_shared; // Shared platinum pieces -/*16748*/ uint8_t unknown16748[1036]; -/*17784*/ uint32_t expansions; // Bitmask for expansions -/*17788*/ uint8_t unknown17788[12]; -/*17800*/ uint32_t autosplit; // 0 = off, 1 = on -/*17804*/ uint8_t unknown17804[16]; -/*17820*/ uint16_t zoneId; // see zones.h -/*17822*/ uint16_t zoneInstance; // Instance id -/*17824*/ uint8_t unknown17824[800]; -/*18624*/ uint32_t leadAAActive; // 0 = leader AA off, 1 = leader AA on -/*18628*/ uint8_t unknown18628[4]; -/*18632*/ uint32_t ldon_guk_points; // Earned GUK points -/*18636*/ uint32_t ldon_mir_points; // Earned MIR points -/*18640*/ uint32_t ldon_mmc_points; // Earned MMC points -/*18644*/ uint32_t ldon_ruj_points; // Earned RUJ points -/*18648*/ uint32_t ldon_tak_points; // Earned TAK points -/*18652*/ uint32_t ldon_avail_points; // Available LDON points -/*18656*/ uint8_t unknown18656[136]; -/*18792*/ uint32_t tributeTime; // Time remaining on tribute (millisecs) -/*18796*/ uint32_t careerTribute; // Total favor points for this char -/*18800*/ uint32_t unknown18800; // *** Placeholder -/*18804*/ uint32_t currentTribute; // Current tribute points -/*18808*/ uint32_t unknown18808; // *** Placeholder -/*18812*/ uint32_t tributeActive; // 0 = off, 1=on -/*18816*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout -/*18856*/ uint8_t unknown18856[4]; -/*18860*/ float expGroupLeadAA; // Current group lead exp points -/*18864*/ uint32_t unknown18864; -/*18868*/ float expRaidLeadAA; // Current raid lead AA exp points -/*18872*/ uint32_t unknown18872; -/*18876*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points -/*18880*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points -/*18884*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks -/*19012*/ uint8_t unknown19012[128]; -/*19140*/ uint32_t airRemaining; // Air supply (seconds) -/*19144*/ uint8_t unknown19144[4608]; -/*23752*/ uint32_t expAA; // Exp earned in current AA point -/*23756*/ uint8_t unknown23756[40]; -/*23796*/ uint32_t currentRadCrystals; // Current count of radiant crystals -/*23800*/ uint32_t careerRadCrystals; // Total count of radiant crystals ever -/*23804*/ uint32_t currentEbonCrystals;// Current count of ebon crystals -/*23808*/ uint32_t careerEbonCrystals; // Total count of ebon crystals ever -/*23812*/ uint8_t groupAutoconsent; // 0=off, 1=on -/*23813*/ uint8_t raidAutoconsent; // 0=off, 1=on -/*23814*/ uint8_t guildAutoconsent; // 0=off, 1=on -/*23815*/ uint8_t unknown23815[5]; // ***Placeholder (6/29/2005) -/*23820*/ uint32_t showhelm; // 0=no, 1=yes -/*23824*/ uint8_t unknown23824[1032]; // ***Placeholder (2/13/2007) -/*24856*/ +/*16660*/ char name[64]; // Name of player +/*16724*/ char lastName[32]; // Last name of player +/*16756*/ uint8_t unknown16756[8]; //***Placeholder (1/18/2006) +/*16764*/ int32_t guildID; // guildID +/*16768*/ uint32_t birthdayTime; // character birthday +/*16772*/ uint32_t lastSaveTime; // character last save time +/*16776*/ uint32_t timePlayedMin; // time character played +/*16780*/ uint8_t unknown16780[4]; +/*16784*/ uint8_t pvp; // 1=pvp, 0=not pvp +/*16785*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon +/*16786*/ uint8_t gm; // 0=no, 1=yes (guessing!) +/*16787*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader +/*16788*/ uint8_t unknown16788[8]; +/*16796*/ uint32_t exp; // Current Experience +/*16800*/ uint8_t unknown16800[12]; +/*16812*/ uint8_t languages[MAX_KNOWN_LANGS]; // List of languages +/*16837*/ uint8_t unknown16837[7]; // All 0x00 (language buffer?) +/*16844*/ float y; // Players y position +/*16848*/ float x; // Players x position +/*16852*/ float z; // Players z position +/*16856*/ float heading; // Players heading +/*16860*/ uint32_t standState; // 0x64 = stand +/*16864*/ uint32_t platinum_bank; // Platinum Pieces in Bank +/*16868*/ uint32_t gold_bank; // Gold Pieces in Bank +/*16872*/ uint32_t silver_bank; // Silver Pieces in Bank +/*16876*/ uint32_t copper_bank; // Copper Pieces in Bank +/*16880*/ uint32_t platinum_shared; // Shared platinum pieces +/*16884*/ uint8_t unknown16884[1036]; +/*17920*/ uint32_t expansions; // Bitmask for expansions +/*17924*/ uint8_t unknown17924[12]; +/*17936*/ uint32_t autosplit; // 0 = off, 1 = on +/*17940*/ uint8_t unknown17940[16]; +/*17956*/ uint16_t zoneId; // see zones.h +/*17958*/ uint16_t zoneInstance; // Instance id +/*17960*/ uint8_t unknown17960[992]; +/*18952*/ uint32_t leadAAActive; // 0 = leader AA off, 1 = leader AA on +/*18956*/ uint8_t unknown18956[4]; +/*18960*/ uint32_t ldon_guk_points; // Earned GUK points +/*18964*/ uint32_t ldon_mir_points; // Earned MIR points +/*18968*/ uint32_t ldon_mmc_points; // Earned MMC points +/*18972*/ uint32_t ldon_ruj_points; // Earned RUJ points +/*18976*/ uint32_t ldon_tak_points; // Earned TAK points +/*18980*/ uint32_t ldon_avail_points; // Available LDON points +/*18984*/ uint8_t unknown18984[136]; +/*19120*/ uint32_t tributeTime; // Time remaining on tribute (millisecs) +/*19124*/ uint32_t careerTribute; // Total favor points for this char +/*19128*/ uint32_t unknown18800; // *** Placeholder +/*19132*/ uint32_t currentTribute; // Current tribute points +/*19136*/ uint32_t unknown19136; // *** Placeholder +/*19140*/ uint32_t tributeActive; // 0 = off, 1=on +/*19144*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout +/*19184*/ uint8_t unknown19184[4]; +/*19188*/ float expGroupLeadAA; // Current group lead exp points +/*19192*/ uint32_t unknown19192; +/*19196*/ float expRaidLeadAA; // Current raid lead AA exp points +/*19200*/ uint32_t unknown19200; +/*19204*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points +/*19208*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points +/*19212*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks +/*19340*/ uint8_t unknown19340[128]; +/*19468*/ uint32_t airRemaining; // Air supply (seconds) +/*19472*/ uint8_t unknown19144[4608]; +/*24080*/ uint32_t expAA; // Exp earned in current AA point +/*24084*/ uint8_t unknown24084[40]; +/*24124*/ uint32_t currentRadCrystals; // Current count of radiant crystals +/*24128*/ uint32_t careerRadCrystals; // Total count of radiant crystals ever +/*24132*/ uint32_t currentEbonCrystals;// Current count of ebon crystals +/*24136*/ uint32_t careerEbonCrystals; // Total count of ebon crystals ever +/*24140*/ uint8_t groupAutoconsent; // 0=off, 1=on +/*24141*/ uint8_t raidAutoconsent; // 0=off, 1=on +/*24142*/ uint8_t guildAutoconsent; // 0=off, 1=on +/*24143*/ uint8_t unknown24143[5]; // ***Placeholder (6/29/2005) +/*24148*/ uint32_t showhelm; // 0=no, 1=yes +/*24152*/ uint8_t unknown24152[1032]; // ***Placeholder (2/13/2007) +/*25184*/ }; #if 0 Modified: showeq/trunk/src/interface.cpp =================================================================== --- showeq/trunk/src/interface.cpp 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/src/interface.cpp 2009-12-20 18:28:40 UTC (rev 744) @@ -1856,14 +1856,14 @@ // "groupUpdateStruct", SZC_None, // m_messageShell, SLOT(groupUpdate(const uint8_t*, size_t, uint8_t))); m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Client|DIR_Server, - "groupInviteStruct", SZC_None, - m_messageShell, SLOT(groupInvite(const uint8_t*, size_t, uint8_t))); + "groupInviteStruct", SZC_None, + m_messageShell, SLOT(groupInvite(const uint8_t*, size_t, uint8_t))); // m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server, // "groupAltInviteStruct", SZC_Match, // m_messageShell, SLOT(groupInvite(const uint8_t*))); m_packet->connect2("OP_GroupInvite2", SP_Zone, DIR_Client, "groupInviteStruct", SZC_Match, - m_messageShell, SLOT(groupInvite(const uint8_t*))); + m_messageShell, SLOT(groupInvite(const uint8_t*, size_t, uint8_t))); m_packet->connect2("OP_GroupFollow", SP_Zone, DIR_Server, "groupFollowStruct", SZC_Match, m_messageShell, SLOT(groupFollow(const uint8_t*))); Modified: showeq/trunk/src/races.h =================================================================== --- showeq/trunk/src/races.h 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/src/races.h 2009-12-20 18:28:40 UTC (rev 744) @@ -630,7 +630,34 @@ "Wagon", // 621 "God of Discord", // 622 "Wrulon Mount", // 623 - "UNKNOWN RACE", // 624 + "Ogre NPC - Male", // 624 "Sokokar Mount", // 625 - "UNKNOWN RACE", // 626 + "Giant (Rallosian mats)", // 626 + "Sokokar (w saddle)", // 627 + "10th Anniversary Banner", // 628 + "10th Anniversary Cake", // 629 + "Wine Cask", // 630 + "Hydra Mount", // 631 + "Hydra NPC", // 632 + "Wedding Flowers", // 633 + "Wedding Arbor", // 634 + "Wedding Altar", // 635 + "Powder Keg", // 636 + "Apexus", // 637 + "Bellikos", // 638 + "Brell's First Creation", // 639 + "Brell", // 640 + "Crystalskin Ambuloid", // 641 + "Cliknar Queen", // 642 + "Cliknar Soldier", // 643 + "Cliknar Worker", // 644 + "Coldain", // 645 + "Coldain", // 646 + "Crystalskin Sessiloid", // 647 + "Genari", // 648 + "Gigyn", // 649 + "Greken - Young Adult", // 650 + "Greken - Young", // 651 + "Cliknar Mount", // 652 + "Telmira", // 653 #endif Modified: showeq/trunk/src/spawn.cpp =================================================================== --- showeq/trunk/src/spawn.cpp 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/src/spawn.cpp 2009-12-20 18:28:40 UTC (rev 744) @@ -98,6 +98,12 @@ #include "weapons2c.h" }; + // sparse array of item names (in 0x2d range), some are NULL + static const char* itemnames2d[] = + { +#include "weapons2d.h" + }; + // assume no material name found const char *itemStr = NULL; @@ -152,6 +158,12 @@ if (itemLo < (sizeof(itemnames2c) / sizeof (char*))) itemStr = itemnames2c[itemLo]; } + else if (itemHi == 0x2d) + { + // retrieve pointer to item name + if (itemLo < (sizeof(itemnames2d) / sizeof (char*))) + itemStr = itemnames2d[itemLo]; + } // if race name exists, then return it, otherwise return a number string if (itemStr != NULL) Modified: showeq/trunk/src/weapons2c.h =================================================================== --- showeq/trunk/src/weapons2c.h 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/src/weapons2c.h 2009-12-20 18:28:40 UTC (rev 744) @@ -6,7 +6,7 @@ */ #ifndef DOXYGEN_SHOULD_SKIP_THIS - NULL, // 0x00 + "Pollen", // 0x00 NULL, // 0x01 NULL, // 0x02 NULL, // 0x03 @@ -59,7 +59,7 @@ NULL, // 0x32 NULL, // 0x33 NULL, // 0x34 - NULL, // 0x35 + "Mushroom", // 0x35 NULL, // 0x36 NULL, // 0x37 NULL, // 0x38 @@ -80,7 +80,7 @@ NULL, // 0x47 NULL, // 0x48 NULL, // 0x49 - NULL, // 0x4a + "Spit", // 0x4a NULL, // 0x4b NULL, // 0x4c NULL, // 0x4d @@ -202,7 +202,7 @@ NULL, // 0xc1 NULL, // 0xc2 NULL, // 0xc3 - NULL, // 0xc4 + "WhiteRose", // 0xc4 NULL, // 0xc5 NULL, // 0xc6 NULL, // 0xc7 Added: showeq/trunk/src/weapons2d.h =================================================================== --- showeq/trunk/src/weapons2d.h (rev 0) +++ showeq/trunk/src/weapons2d.h 2009-12-20 18:28:40 UTC (rev 744) @@ -0,0 +1,265 @@ +/* + * 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 + "FletchingTable", // 0x16 + "JewelryMakingTable", // 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 + NULL, // 0xed + NULL, // 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 */ Modified: showeq/trunk/src/zones.h =================================================================== --- showeq/trunk/src/zones.h 2009-10-26 21:52:38 UTC (rev 743) +++ showeq/trunk/src/zones.h 2009-12-20 18:28:40 UTC (rev 744) @@ -485,24 +485,24 @@ { "toskirakk", "Toskirakk" }, // 475 { "korascian", "Korascian Warrens" }, // 476 { "rathechamber", "Rathe Council Chambers" }, // 477 -{ NULL, NULL }, // 478 -{ NULL, NULL }, // 479 -{ NULL, NULL }, // 480 -{ NULL, NULL }, // 481 -{ NULL, NULL }, // 482 -{ NULL, NULL }, // 483 -{ NULL, NULL }, // 484 -{ NULL, NULL }, // 485 -{ NULL, NULL }, // 486 -{ NULL, NULL }, // 487 -{ NULL, NULL }, // 488 -{ NULL, NULL }, // 489 -{ NULL, NULL }, // 490 -{ NULL, NULL }, // 491 -{ NULL, NULL }, // 492 -{ NULL, NULL }, // 493 -{ NULL, NULL }, // 494 -{ NULL, NULL }, // 495 +{ "oldfieldofboneb", "Field of Scale" }, // 478 +{ "crafthalls", "Ngreth's Den" }, // 479 +{ "brellsrest", "Brell's Rest" }, // 480 +{ "fungalforest", "Fungal Forest" }, // 481 +{ "underquarry", "The Underquarry" }, // 482 +{ "coolingchamber", "The Cooling Chamber" }, // 483 +{ "shiningcity", "Kernagir, The Shining City" }, // 484 +{ "arthicrex", "Arthicrex" }, // 485 +{ "foundation", "The Foundation" }, // 486 +{ "lichencreep", "Lichen Creep" }, // 487 +{ "pellucid", "Pellucid Grotto" }, // 488 +{ "stonesnake", "Volska's Husk" }, // 489 +{ "brellstemple", "Brell's Temple" }, // 490 +{ "convorteum", "The Convorteum" }, // 491 +{ "brellsarena", "Brell's Arena" }, // 492 +{ "weddingchapel", "Wedding Chapel" }, // 493 +{ "weddingchapeldark", "Wedding Chapel" }, // 494 +{ "dragoncrypt", "Lair of the Fallen" }, // 495 { NULL, NULL }, // 496 { NULL, NULL }, // 497 { NULL, NULL }, // 498 @@ -707,18 +707,18 @@ { NULL, NULL }, // 697 { NULL, NULL }, // 698 { NULL, NULL }, // 699 -{ NULL, NULL }, // 700 -{ NULL, NULL }, // 701 -{ NULL, NULL }, // 702 -{ NULL, NULL }, // 703 -{ NULL, NULL }, // 704 -{ NULL, NULL }, // 705 -{ NULL, NULL }, // 706 -{ NULL, NULL }, // 707 -{ NULL, NULL }, // 708 -{ NULL, NULL }, // 709 -{ NULL, NULL }, // 710 -{ NULL, NULL }, // 711 +{ "feerrott2", "The Feerrott" }, // 700 +{ "thulehouse1", "Thule House 1" }, // 701 +{ "thulehouse2", "Thule House 2" }, // 702 +{ "housegarden", "House Garden" }, // 703 +{ "houselibrary", "House Library" }, // 704 +{ "well", "Well" }, // 705 +{ "fallen", "Fallen" }, // 706 +{ "morellcastle", "Morell's Castle" }, // 707 +{ "morelltower", "Morell's Tower" }, // 708 +{ "alkabormare", "Al'Kabor's Nightmare" }, // 709 +{ "miragulmare", "Miragul's Nightmare" }, // 710 +{ "thuledream", "Thule's Dream" }, // 711 { NULL, NULL }, // 712 { NULL, NULL }, // 713 { NULL, NULL }, // 714 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-10-26 21:52:45
|
Revision: 743 http://seq.svn.sourceforge.net/seq/?rev=743&view=rev Author: ieatacid Date: 2009-10-26 21:52:38 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Tag for release 5.13.8.0 Added Paths: ----------- showeq/tags/v5_13_8_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-10-26 21:14:24
|
Revision: 742 http://seq.svn.sourceforge.net/seq/?rev=742&view=rev Author: ieatacid Date: 2009-10-26 21:14:06 +0000 (Mon, 26 Oct 2009) Log Message: ----------- Updated opcodes and spawnIllusionStruct Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/conf/zoneopcodes.xml showeq/trunk/configure.in showeq/trunk/src/everquest.h Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-09-20 00:43:42 UTC (rev 741) +++ showeq/trunk/ChangeLog 2009-10-26 21:14:06 UTC (rev 742) @@ -1,3 +1,9 @@ +ieatacid (10/26/09) +----------------- +- Updated version to 5.13.8 +- Updated opcodes +- Updated spawnIllusionStruct + ieatacid (9/16/09) ----------------- - Updated version to 5.13.7 Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-09-20 00:43:42 UTC (rev 741) +++ showeq/trunk/conf/zoneopcodes.xml 2009-10-26 21:14:06 UTC (rev 742) @@ -5,96 +5,96 @@ <!-- Critical opcodes used directly by ShowEQ --> - <opcode id="654F" name="OP_NpcMoveUpdate" updated="09/15/09"> + <opcode id="292F" name="OP_NpcMoveUpdate" updated="10/21/09"> <comment>Position updates</comment> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="4B7B" name="OP_MovementHistory" updated="09/15/09"> + <opcode id="09B4" name="OP_MovementHistory" updated="10/21/09"> <comment></comment> <payload dir="client" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="21BE" name="OP_DeleteSpawn" updated="09/15/09"> + <opcode id="63F8" name="OP_DeleteSpawn" updated="10/21/09"> <comment>old DeleteSpawnCode</comment> <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/> </opcode> - <opcode id="538F" name="OP_ZoneEntry" updated="09/15/09"> + <opcode id="4B61" name="OP_ZoneEntry" updated="10/21/09"> <comment>old ZoneEntryCode</comment> <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="3088" name="OP_GuildMOTD" updated="09/15/09"> + <opcode id="5658" name="OP_GuildMOTD" updated="10/21/09"> <comment>GuildMOTD</comment> <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> </opcode> - <opcode id="2370" name="OP_InspectAnswer" updated="09/15/09"> + <opcode id="0C2B" name="OP_InspectAnswer" updated="10/21/09"> <comment>old InspectDataCode</comment> <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> </opcode> - <opcode id="0FF4" name="OP_SendZonePoints" updated="09/15/09"> + <opcode id="2370" name="OP_SendZonePoints" updated="10/21/09"> <comment>Coords in a zone that will port you to another zone</comment> <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> </opcode> - <opcode id="36F8" name="OP_TargetMouse" updated="09/15/09"> + <opcode id="5F5E" name="OP_TargetMouse" updated="10/21/09"> <comment>Targeting a person - old ClientTargetCode</comment> <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/> </opcode> - <opcode id="4A20" name="OP_Shroud" updated="09/15/09"> + <opcode id="66B4" name="OP_Shroud" updated="10/21/09"> <comment>Server putting players into shroud form</comment> <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/> </opcode> - <opcode id="0786" name="OP_GroupFollow" updated="09/15/09"> + <opcode id="1715" name="OP_GroupFollow" updated="10/21/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>You join a group</comment> </opcode> - <opcode id="0C33" name="OP_GroupFollow2" updated="09/15/09"> + <opcode id="59A8" name="OP_GroupFollow2" updated="10/21/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>Player joins your group</comment> </opcode> - <opcode id="5331" name="OP_GroupUpdate" updated="09/15/09"> + <opcode id="390C" name="OP_GroupUpdate" updated="10/21/09"> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Variable length packet with group member names</comment> </opcode> - <opcode id="4717" name="OP_GroupDisband" updated="09/15/09"> + <opcode id="0BFD" name="OP_GroupDisband" updated="10/21/09"> <comment>You disband from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="4481" name="OP_GroupDisband2" updated="09/15/09"> + <opcode id="08C3" name="OP_GroupDisband2" updated="10/21/09"> <comment>Other disbands from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="6B67" name="OP_GroupLeader" updated="09/15/09"> + <opcode id="49F6" name="OP_GroupLeader" updated="10/21/09"> <comment>Group leader change</comment> <payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="0EFC" name="OP_DzSwitchInfo" updated="09/15/09"> + <opcode id="3BDD" name="OP_DzSwitchInfo" updated="10/21/09"> <comment></comment> <payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/> </opcode> - <opcode id="1879" name="OP_DzInfo" updated="09/15/09"> + <opcode id="4C14" name="OP_DzInfo" updated="10/21/09"> <comment></comment> <payload dir="server" typename="dzInfo" sizechecktype="match"/> </opcode> - <opcode id="0A18" name="OP_FormattedMessage" updated="09/15/09"> + <opcode id="3B52" name="OP_FormattedMessage" updated="10/21/09"> <comment>old FormattedMessageCode</comment> <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="47AE" name="OP_SpawnDoor" updated="09/15/09"> + <opcode id="6F2B" name="OP_SpawnDoor" updated="10/21/09"> <comment>old DoorSpawnsCode</comment> <payload dir="server" typename="doorStruct" sizechecktype="modulus"/> </opcode> - <opcode id="3CD6" name="OP_AAExpUpdate" updated="09/15/09"> + <opcode id="4AA2" name="OP_AAExpUpdate" updated="10/21/09"> <comment>Receiving AA experience. Also when percent to AA changes.</comment> <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="4938" name="OP_HPUpdate" updated="09/15/09"> + <opcode id="6145" name="OP_HPUpdate" updated="10/21/09"> <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment> <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="15B2" name="OP_GuildMemberUpdate" updated="09/15/09"> + <opcode id="0A53" name="OP_GuildMemberUpdate" updated="10/21/09"> <comment></comment> <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/> </opcode> - <opcode id="1318" name="OP_SpawnRename" updated="09/15/09"> + <opcode id="0507" name="OP_SpawnRename" updated="10/21/09"> <comment>Spawns getting renamed after initial NewSpawn</comment> <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/> </opcode> @@ -102,65 +102,65 @@ <payload dir="server" typename="groupInviteStruct" sizechecktype="match"/> <comment>You got invited to a group</comment> </opcode>--> - <opcode id="389A" name="OP_GroupInvite" updated="09/15/09"> + <opcode id="5251" name="OP_GroupInvite" updated="10/21/09"> <payload dir="both" typename="groupInviteStruct" sizechecktype="none"/> <comment>You invite or get invited</comment> </opcode> - <opcode id="73D6" name="OP_SwapSpell" updated="09/15/09"> + <opcode id="5805" name="OP_SwapSpell" updated="10/21/09"> <comment>old TradeSpellBookSlotsCode</comment> <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/> </opcode> - <opcode id="2137" name="OP_SimpleMessage" updated="09/15/09"> + <opcode id="1F4D" name="OP_SimpleMessage" updated="10/21/09"> <comment>old SimpleMessageCode</comment> <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/> </opcode> - <opcode id="14FF" name="OP_SpecialMesg" updated="09/15/09"> + <opcode id="016C" name="OP_SpecialMesg" updated="10/21/09"> <comment>Communicate textual info to client</comment> <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="86C7" name="OP_RandomReq" updated="09/15/09"> + <opcode id="139D" name="OP_RandomReq" updated="10/21/09"> <comment>old RandomReqCode</comment> <payload dir="client" typename="randomReqStruct" sizechecktype="match"/> </opcode> - <opcode id="0E24" name="OP_ConsentResponse" updated="09/15/09"> + <opcode id="0E87" name="OP_ConsentResponse" updated="10/21/09"> <comment>Server replying with consent information after /consent</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="4CD1" name="OP_DenyResponse" updated="09/15/09"> + <opcode id="6129" name="OP_DenyResponse" updated="10/21/09"> <comment>Server replying with deny information after /deny</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="3B85" name="OP_BazaarSearch" updated="09/15/09"> + <opcode id="550F" name="OP_BazaarSearch" updated="10/21/09"> <payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/> <payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Bazaar search tool</comment> </opcode> - <opcode id="1F92" name="OP_WearChange" updated="09/15/09"> + <opcode id="0400" name="OP_WearChange" updated="10/21/09"> <comment>old SpawnUpdateCode</comment> <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="4B1A" name="OP_SpawnAppearance" updated="09/15/09"> + <opcode id="3E17" name="OP_SpawnAppearance" updated="10/21/09"> <comment>old SpawnAppearanceCode</comment> <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/> </opcode> - <opcode id="72F8" name="OP_Stamina" updated="09/15/09"> + <opcode id="3D86" name="OP_Stamina" updated="10/21/09"> <comment>Server updating on hunger/thirst</comment> <payload dir="server" typename="staminaStruct" sizechecktype="match"/> </opcode> - <opcode id="3A18" name="OP_Consider" updated="09/15/09"> + <opcode id="3C2D" name="OP_Consider" updated="10/21/09"> <comment>old ConsiderCode</comment> <payload dir="both" typename="considerStruct" sizechecktype="match"/> </opcode> - <opcode id="4A61" name="OP_ZoneChange" updated="09/15/09"> + <opcode id="6D37" name="OP_ZoneChange" updated="10/21/09"> <comment>old ZoneChangeCode</comment> <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="2963" name="OP_Buff" updated="09/15/09"> + <opcode id="0D1D" name="OP_Buff" updated="10/21/09"> <comment>old BuffDropCode</comment> <payload dir="both" typename="buffStruct" sizechecktype="match"/> </opcode> - <opcode id="3D86" name="OP_Logout" updated="09/15/09"> + <opcode id="2EE2" name="OP_Logout" updated="10/21/09"> <comment></comment> <payload dir="server" typename="none" sizechecktype="match"/> </opcode> Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-09-20 00:43:42 UTC (rev 741) +++ showeq/trunk/configure.in 2009-10-26 21:14:06 UTC (rev 742) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.7.0) +AC_INIT(showeq, 5.13.8.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-09-20 00:43:42 UTC (rev 741) +++ showeq/trunk/src/everquest.h 2009-10-26 21:14:06 UTC (rev 742) @@ -1453,10 +1453,11 @@ /*0072*/ uint8_t gender; // New gender (0=male, 1=female) /*0073*/ uint8_t texture; // ??? /*0074*/ uint8_t helm; // ??? -/*0075*/ uint8_t unknown0077; // ***Placeholder -/*0076*/ uint32_t face; // New face -/*0080*/ uint8_t unknown0080[176]; // ***Placeholder -/*0256*/ +/*0075*/ uint8_t unknown0075; // ***Placeholder +/*0076*/ uint32_t unknown0076; // ***Placeholder +/*0080*/ uint32_t face; // New face +/*0084*/ uint8_t unknown0084[176]; // ***Placeholder +/*0260*/ }; /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-09-20 00:44:27
|
Revision: 741 http://seq.svn.sourceforge.net/seq/?rev=741&view=rev Author: ieatacid Date: 2009-09-20 00:43:42 +0000 (Sun, 20 Sep 2009) Log Message: ----------- + Fixed OP_Consider Modified Paths: -------------- showeq/trunk/conf/zoneopcodes.xml Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-09-17 02:19:28 UTC (rev 740) +++ showeq/trunk/conf/zoneopcodes.xml 2009-09-20 00:43:42 UTC (rev 741) @@ -148,7 +148,7 @@ <comment>Server updating on hunger/thirst</comment> <payload dir="server" typename="staminaStruct" sizechecktype="match"/> </opcode> - <opcode id="48B8" name="OP_Consider" updated="09/15/09"> + <opcode id="3A18" name="OP_Consider" updated="09/15/09"> <comment>old ConsiderCode</comment> <payload dir="both" typename="considerStruct" sizechecktype="match"/> </opcode> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-09-17 02:19:34
|
Revision: 740 http://seq.svn.sourceforge.net/seq/?rev=740&view=rev Author: ieatacid Date: 2009-09-17 02:19:28 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Tag for release 5.13.7.0 Added Paths: ----------- showeq/tags/v5_13_7_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-09-17 02:17:54
|
Revision: 739 http://seq.svn.sourceforge.net/seq/?rev=739&view=rev Author: ieatacid Date: 2009-09-17 02:17:45 +0000 (Thu, 17 Sep 2009) Log Message: ----------- + Updated opcodes for 9/15 patch + Fixed group invite message code + Version to 5.13.7 Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/conf/zoneopcodes.xml showeq/trunk/configure.in showeq/trunk/src/interface.cpp showeq/trunk/src/messageshell.cpp showeq/trunk/src/messageshell.h Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-08-25 00:51:03 UTC (rev 738) +++ showeq/trunk/ChangeLog 2009-09-17 02:17:45 UTC (rev 739) @@ -1,3 +1,9 @@ +ieatacid (9/16/09) +----------------- +- Updated version to 5.13.7 +- Opcodes updated +- Group invite message code fixed (I hope) + ieatacid (8/24/09) ----------------- - Updated version to 5.13.6.1 Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-08-25 00:51:03 UTC (rev 738) +++ showeq/trunk/conf/zoneopcodes.xml 2009-09-17 02:17:45 UTC (rev 739) @@ -5,162 +5,162 @@ <!-- Critical opcodes used directly by ShowEQ --> - <opcode id="6A86" name="OP_NpcMoveUpdate" updated="08/12/09"> + <opcode id="654F" name="OP_NpcMoveUpdate" updated="09/15/09"> <comment>Position updates</comment> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="4B05" name="OP_MovementHistory" updated="08/12/09"> + <opcode id="4B7B" name="OP_MovementHistory" updated="09/15/09"> <comment></comment> <payload dir="client" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="4315" name="OP_DeleteSpawn" updated="08/12/09"> + <opcode id="21BE" name="OP_DeleteSpawn" updated="09/15/09"> <comment>old DeleteSpawnCode</comment> <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/> </opcode> - <opcode id="3AD9" name="OP_ZoneEntry" updated="08/12/09"> + <opcode id="538F" name="OP_ZoneEntry" updated="09/15/09"> <comment>old ZoneEntryCode</comment> <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="35B1" name="OP_GuildMOTD" updated="08/12/09"> + <opcode id="3088" name="OP_GuildMOTD" updated="09/15/09"> <comment>GuildMOTD</comment> <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> </opcode> - <opcode id="0FF4" name="OP_InspectAnswer" updated="08/12/09"> + <opcode id="2370" name="OP_InspectAnswer" updated="09/15/09"> <comment>old InspectDataCode</comment> <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> </opcode> - <opcode id="6967" name="OP_SendZonePoints" updated="08/12/09"> + <opcode id="0FF4" name="OP_SendZonePoints" updated="09/15/09"> <comment>Coords in a zone that will port you to another zone</comment> <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> </opcode> - <opcode id="41A6" name="OP_TargetMouse" updated="08/12/09"> + <opcode id="36F8" name="OP_TargetMouse" updated="09/15/09"> <comment>Targeting a person - old ClientTargetCode</comment> <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/> </opcode> - <opcode id="666D" name="OP_Shroud" updated="08/12/09"> + <opcode id="4A20" name="OP_Shroud" updated="09/15/09"> <comment>Server putting players into shroud form</comment> <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/> </opcode> - <opcode id="390C" name="OP_GroupFollow" updated="08/12/09"> + <opcode id="0786" name="OP_GroupFollow" updated="09/15/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>You join a group</comment> </opcode> - <opcode id="49F6" name="OP_GroupFollow2" updated="08/12/09"> + <opcode id="0C33" name="OP_GroupFollow2" updated="09/15/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>Player joins your group</comment> </opcode> - <opcode id="59A8" name="OP_GroupUpdate" updated="08/12/09"> + <opcode id="5331" name="OP_GroupUpdate" updated="09/15/09"> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Variable length packet with group member names</comment> </opcode> - <opcode id="0786" name="OP_GroupDisband" updated="08/12/09"> + <opcode id="4717" name="OP_GroupDisband" updated="09/15/09"> <comment>You disband from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="C56C" name="OP_GroupDisband2" updated="08/12/09"> + <opcode id="4481" name="OP_GroupDisband2" updated="09/15/09"> <comment>Other disbands from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="4481" name="OP_GroupLeader" updated="08/12/09"> + <opcode id="6B67" name="OP_GroupLeader" updated="09/15/09"> <comment>Group leader change</comment> <payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="3841" name="OP_DzSwitchInfo" updated="08/12/09"> + <opcode id="0EFC" name="OP_DzSwitchInfo" updated="09/15/09"> <comment></comment> <payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/> </opcode> - <opcode id="1875" name="OP_DzInfo" updated="08/12/09"> + <opcode id="1879" name="OP_DzInfo" updated="09/15/09"> <comment></comment> <payload dir="server" typename="dzInfo" sizechecktype="match"/> </opcode> - <opcode id="48B8" name="OP_FormattedMessage" updated="08/12/09"> + <opcode id="0A18" name="OP_FormattedMessage" updated="09/15/09"> <comment>old FormattedMessageCode</comment> <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="1AC1" name="OP_SpawnDoor" updated="08/12/09"> + <opcode id="47AE" name="OP_SpawnDoor" updated="09/15/09"> <comment>old DoorSpawnsCode</comment> <payload dir="server" typename="doorStruct" sizechecktype="modulus"/> </opcode> - <opcode id="38D1" name="OP_AAExpUpdate" updated="08/12/09"> + <opcode id="3CD6" name="OP_AAExpUpdate" updated="09/15/09"> <comment>Receiving AA experience. Also when percent to AA changes.</comment> <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="5821" name="OP_HPUpdate" updated="08/12/09"> + <opcode id="4938" name="OP_HPUpdate" updated="09/15/09"> <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment> <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="16F5" name="OP_GuildMemberUpdate" updated="08/12/09"> + <opcode id="15B2" name="OP_GuildMemberUpdate" updated="09/15/09"> <comment></comment> <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/> </opcode> - <opcode id="37A7" name="OP_SpawnRename" updated="08/12/09"> + <opcode id="1318" name="OP_SpawnRename" updated="09/15/09"> <comment>Spawns getting renamed after initial NewSpawn</comment> <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/> </opcode> - <opcode id="099D" name="OP_GroupInvited" updated="08/12/09"> + <!--<opcode id="5251" name="OP_GroupInvited" updated="09/15/09"> <payload dir="server" typename="groupInviteStruct" sizechecktype="match"/> <comment>You got invited to a group</comment> + </opcode>--> + <opcode id="389A" name="OP_GroupInvite" updated="09/15/09"> + <payload dir="both" typename="groupInviteStruct" sizechecktype="none"/> + <comment>You invite or get invited</comment> </opcode> - <opcode id="7930" name="OP_GroupInvite" updated="08/12/09"> - <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> - <comment>You're inviting someone and you're not grouped</comment> - </opcode> - <opcode id="1497" name="OP_SwapSpell" updated="08/12/09"> + <opcode id="73D6" name="OP_SwapSpell" updated="09/15/09"> <comment>old TradeSpellBookSlotsCode</comment> <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/> </opcode> - <opcode id="6884" name="OP_SimpleMessage" updated="08/12/09"> + <opcode id="2137" name="OP_SimpleMessage" updated="09/15/09"> <comment>old SimpleMessageCode</comment> <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/> </opcode> - <opcode id="429B" name="OP_SpecialMesg" updated="08/12/09"> + <opcode id="14FF" name="OP_SpecialMesg" updated="09/15/09"> <comment>Communicate textual info to client</comment> <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="28A7" name="OP_RandomReq" updated="08/12/09"> + <opcode id="86C7" name="OP_RandomReq" updated="09/15/09"> <comment>old RandomReqCode</comment> <payload dir="client" typename="randomReqStruct" sizechecktype="match"/> </opcode> - <opcode id="7113" name="OP_ConsentResponse" updated="08/12/09"> + <opcode id="0E24" name="OP_ConsentResponse" updated="09/15/09"> <comment>Server replying with consent information after /consent</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="1AC8" name="OP_DenyResponse" updated="08/12/09"> + <opcode id="4CD1" name="OP_DenyResponse" updated="09/15/09"> <comment>Server replying with deny information after /deny</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="60B5" name="OP_BazaarSearch" updated="08/12/09"> + <opcode id="3B85" name="OP_BazaarSearch" updated="09/15/09"> <payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/> <payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Bazaar search tool</comment> </opcode> - <opcode id="2B9D" name="OP_WearChange" updated="08/12/09"> + <opcode id="1F92" name="OP_WearChange" updated="09/15/09"> <comment>old SpawnUpdateCode</comment> <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="03A9" name="OP_SpawnAppearance" updated="08/12/09"> + <opcode id="4B1A" name="OP_SpawnAppearance" updated="09/15/09"> <comment>old SpawnAppearanceCode</comment> <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/> </opcode> - <opcode id="52B5" name="OP_Stamina" updated="08/12/09"> + <opcode id="72F8" name="OP_Stamina" updated="09/15/09"> <comment>Server updating on hunger/thirst</comment> <payload dir="server" typename="staminaStruct" sizechecktype="match"/> </opcode> - <opcode id="7452" name="OP_Consider" updated="08/12/09"> + <opcode id="48B8" name="OP_Consider" updated="09/15/09"> <comment>old ConsiderCode</comment> <payload dir="both" typename="considerStruct" sizechecktype="match"/> </opcode> - <opcode id="24A3" name="OP_ZoneChange" updated="08/12/09"> + <opcode id="4A61" name="OP_ZoneChange" updated="09/15/09"> <comment>old ZoneChangeCode</comment> <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="66C5" name="OP_Buff" updated="08/12/09"> + <opcode id="2963" name="OP_Buff" updated="09/15/09"> <comment>old BuffDropCode</comment> <payload dir="both" typename="buffStruct" sizechecktype="match"/> </opcode> - <opcode id="72F8" name="OP_Logout" updated="08/12/09"> + <opcode id="3D86" name="OP_Logout" updated="09/15/09"> <comment></comment> <payload dir="server" typename="none" sizechecktype="match"/> </opcode> Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-08-25 00:51:03 UTC (rev 738) +++ showeq/trunk/configure.in 2009-09-17 02:17:45 UTC (rev 739) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.6.1) +AC_INIT(showeq, 5.13.7.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/interface.cpp =================================================================== --- showeq/trunk/src/interface.cpp 2009-08-25 00:51:03 UTC (rev 738) +++ showeq/trunk/src/interface.cpp 2009-09-17 02:17:45 UTC (rev 739) @@ -1855,9 +1855,9 @@ // m_packet->connect2("OP_GroupUpdate", SP_Zone, DIR_Server, // "groupUpdateStruct", SZC_None, // m_messageShell, SLOT(groupUpdate(const uint8_t*, size_t, uint8_t))); - m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Client, - "groupInviteStruct", SZC_Match, - m_messageShell, SLOT(groupInvite(const uint8_t*))); + m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Client|DIR_Server, + "groupInviteStruct", SZC_None, + m_messageShell, SLOT(groupInvite(const uint8_t*, size_t, uint8_t))); // m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server, // "groupAltInviteStruct", SZC_Match, // m_messageShell, SLOT(groupInvite(const uint8_t*))); Modified: showeq/trunk/src/messageshell.cpp =================================================================== --- showeq/trunk/src/messageshell.cpp 2009-08-25 00:51:03 UTC (rev 738) +++ showeq/trunk/src/messageshell.cpp 2009-09-17 02:17:45 UTC (rev 739) @@ -680,12 +680,16 @@ m_messages->addMessage(MT_Group, tempStr); } -void MessageShell::groupInvite(const uint8_t* data) +void MessageShell::groupInvite(const uint8_t* data, size_t len, uint8_t dir) { const groupInviteStruct* gmem = (const groupInviteStruct*)data; QString tempStr; - tempStr.sprintf("Invite: %s invites %s to join the group", - gmem->inviter, gmem->invitee); + + if(dir == DIR_Client) + tempStr.sprintf("Invite: You invite %s to join the group", gmem->invitee); + else + tempStr.sprintf("Invite: %s invites %s to join the group", gmem->inviter, gmem->invitee); + m_messages->addMessage(MT_Group, tempStr); } Modified: showeq/trunk/src/messageshell.h =================================================================== --- showeq/trunk/src/messageshell.h 2009-08-25 00:51:03 UTC (rev 738) +++ showeq/trunk/src/messageshell.h 2009-09-17 02:17:45 UTC (rev 739) @@ -76,7 +76,7 @@ void startCast(const uint8_t* cast); void groupUpdate(const uint8_t* gmem, size_t, uint8_t); - void groupInvite(const uint8_t* gmem); + void groupInvite(const uint8_t* gmem, size_t, uint8_t); void groupDecline(const uint8_t* gmem); void groupFollow(const uint8_t* gmem); void groupDisband(const uint8_t* gmem); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-08-25 00:51:13
|
Revision: 738 http://seq.svn.sourceforge.net/seq/?rev=738&view=rev Author: ieatacid Date: 2009-08-25 00:51:03 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Tag for release 5.13.6.1 Added Paths: ----------- showeq/tags/v5_13_6_1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-08-25 00:49:40
|
Revision: 737 http://seq.svn.sourceforge.net/seq/?rev=737&view=rev Author: ieatacid Date: 2009-08-25 00:49:31 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Fixed buffer overflow in interface.cpp Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/configure.in showeq/trunk/src/interface.cpp Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-08-21 03:20:30 UTC (rev 736) +++ showeq/trunk/ChangeLog 2009-08-25 00:49:31 UTC (rev 737) @@ -1,3 +1,15 @@ +ieatacid (8/24/09) +----------------- +- Updated version to 5.13.6.1 +- Fixed buffer overflow in interface.cpp + +ieatacid (8/20/09) +----------------- +- Updated version to 5.13.6 +- Updated opcodes +- Updated structs +- Updated source code where necessary + ieatacid (6/20/09) ----------------- - Updated version to 5.13.5 Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-08-21 03:20:30 UTC (rev 736) +++ showeq/trunk/configure.in 2009-08-25 00:49:31 UTC (rev 737) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.6.0) +AC_INIT(showeq, 5.13.6.1) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/interface.cpp =================================================================== --- showeq/trunk/src/interface.cpp 2009-08-21 03:20:30 UTC (rev 736) +++ showeq/trunk/src/interface.cpp 2009-08-25 00:49:31 UTC (rev 737) @@ -4304,7 +4304,7 @@ { if (m_stsbarExp) { - char expperc[5]; + char expperc[32]; sprintf(expperc, "%.2f", totalTick*100.0/330.0); m_stsbarExp->setText(QString("Exp: %1 (%2/330, %3%)") @@ -4333,7 +4333,7 @@ if (m_stsbarExp) { - char expperc[5]; + char expperc[32]; sprintf(expperc, "%.2f", totalTick*100.0/330.0); m_stsbarExp->setText(QString("Exp: %1 (%2/330, %3%)") @@ -4350,7 +4350,7 @@ if (m_stsbarExp) { - char expperc[5]; + char expperc[32]; sprintf(expperc, "%.2f", totalTick*100.0/330.0); m_stsbarExp->setText(QString("Exp: %1 (%2/330, %3%)") @@ -4374,7 +4374,7 @@ { if (m_stsbarExpAA) { - char aaperc[5]; + char aaperc[32]; sprintf(aaperc, "%.2f", totalTick*100.0/330.0); m_stsbarExpAA->setText(QString("ExpAA: %1 (%2/330, %3%)") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-08-21 03:20:43
|
Revision: 736 http://seq.svn.sourceforge.net/seq/?rev=736&view=rev Author: ieatacid Date: 2009-08-21 03:20:30 +0000 (Fri, 21 Aug 2009) Log Message: ----------- Tag for release 5.13.6.0 Added Paths: ----------- showeq/tags/v5_13_6_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-08-21 03:03:56
|
Revision: 735 http://seq.svn.sourceforge.net/seq/?rev=735&view=rev Author: ieatacid Date: 2009-08-21 03:03:49 +0000 (Fri, 21 Aug 2009) Log Message: ----------- Fixes for 8/12/09 Modified Paths: -------------- showeq/trunk/conf/zoneopcodes.xml showeq/trunk/configure.in showeq/trunk/src/s_everquest.h Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-08-17 00:06:27 UTC (rev 734) +++ showeq/trunk/conf/zoneopcodes.xml 2009-08-21 03:03:49 UTC (rev 735) @@ -291,12 +291,13 @@ <!-- Not necessary for SEQ to run but here to name packets in logs. --> - <opcode id="7598" name="OP_SendAATable" updated="06/12/09"> + <opcode id="3B85" name="OP_SendAATable" updated="08/12/09"> <comment></comment> </opcode> - <opcode id="1ce3" name="OP_SendAAStats" updated="06/12/09"> + <opcode id="5832" name="OP_SendAAStats" updated="08/12/09"> <comment></comment> </opcode> + <!-- Below are unverified as of 12-1-2007 --> <opcode id="4d38" name="OP_AckPacket" updated="03/14/07"> <comment>Appears to be generic ack at the presentation level</comment> Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-08-17 00:06:27 UTC (rev 734) +++ showeq/trunk/configure.in 2009-08-21 03:03:49 UTC (rev 735) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.5.0) +AC_INIT(showeq, 5.13.6.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/s_everquest.h =================================================================== --- showeq/trunk/src/s_everquest.h 2009-08-17 00:06:27 UTC (rev 734) +++ showeq/trunk/src/s_everquest.h 2009-08-21 03:03:49 UTC (rev 735) @@ -65,7 +65,6 @@ AddStruct(groupUpdateStruct); AddStruct(groupFullUpdateStruct); AddStruct(groupInviteStruct); -AddStruct(groupAltInviteStruct); AddStruct(groupDeclineStruct); AddStruct(groupFollowStruct); AddStruct(groupDisbandStruct); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-08-17 00:06:35
|
Revision: 734 http://seq.svn.sourceforge.net/seq/?rev=734&view=rev Author: ieatacid Date: 2009-08-17 00:06:27 +0000 (Mon, 17 Aug 2009) Log Message: ----------- Updated Opcodes and source code for August 12 2009 patch Modified Paths: -------------- showeq/trunk/conf/zoneopcodes.xml showeq/trunk/src/everquest.h showeq/trunk/src/interface.cpp showeq/trunk/src/messageshell.cpp showeq/trunk/src/netstream.cpp showeq/trunk/src/spawnshell.cpp Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-06-20 22:46:06 UTC (rev 733) +++ showeq/trunk/conf/zoneopcodes.xml 2009-08-17 00:06:27 UTC (rev 734) @@ -5,133 +5,174 @@ <!-- Critical opcodes used directly by ShowEQ --> - <opcode id="03D1" name="OP_NpcMoveUpdate" updated="06/12/09"> + <opcode id="6A86" name="OP_NpcMoveUpdate" updated="08/12/09"> <comment>Position updates</comment> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="4036" name="OP_DeleteSpawn" updated="06/12/09"> + <opcode id="4B05" name="OP_MovementHistory" updated="08/12/09"> + <comment></comment> + <payload dir="client" typename="uint8_t" sizechecktype="none"/> + </opcode> + <opcode id="4315" name="OP_DeleteSpawn" updated="08/12/09"> <comment>old DeleteSpawnCode</comment> <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/> </opcode> - <opcode id="09E3" name="OP_RespawnFromHover" updated="06/12/09"> - <comment>Server telling client that it is coming back from hover death</comment> - <payload dir="both" typename="uint8_t" sizechecktype="none"/> + <opcode id="3AD9" name="OP_ZoneEntry" updated="08/12/09"> + <comment>old ZoneEntryCode</comment> + <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/> + <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="48CD" name="OP_Shroud" updated="06/12/09"> + <opcode id="35B1" name="OP_GuildMOTD" updated="08/12/09"> + <comment>GuildMOTD</comment> + <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> + </opcode> + <opcode id="0FF4" name="OP_InspectAnswer" updated="08/12/09"> + <comment>old InspectDataCode</comment> + <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> + </opcode> + <opcode id="6967" name="OP_SendZonePoints" updated="08/12/09"> + <comment>Coords in a zone that will port you to another zone</comment> + <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> + </opcode> + <opcode id="41A6" name="OP_TargetMouse" updated="08/12/09"> + <comment>Targeting a person - old ClientTargetCode</comment> + <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/> + </opcode> + <opcode id="666D" name="OP_Shroud" updated="08/12/09"> <comment>Server putting players into shroud form</comment> <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/> </opcode> - <opcode id="1C50" name="OP_GroupFollow" updated="06/12/09"> + <opcode id="390C" name="OP_GroupFollow" updated="08/12/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>You join a group</comment> </opcode> - <opcode id="49F6" name="OP_GroupFollow2" updated="06/12/09"> + <opcode id="49F6" name="OP_GroupFollow2" updated="08/12/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>Player joins your group</comment> </opcode> - <opcode id="4481" name="OP_GroupUpdate" updated="06/12/09"> + <opcode id="59A8" name="OP_GroupUpdate" updated="08/12/09"> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Variable length packet with group member names</comment> </opcode> - <opcode id="0C33" name="OP_GroupDisband" updated="06/12/09"> + <opcode id="0786" name="OP_GroupDisband" updated="08/12/09"> <comment>You disband from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="58E6" name="OP_GroupDisband2" updated="06/12/09"> + <opcode id="C56C" name="OP_GroupDisband2" updated="08/12/09"> <comment>Other disbands from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="63F8" name="OP_GroupLeader" updated="06/12/09"> + <opcode id="4481" name="OP_GroupLeader" updated="08/12/09"> <comment>Group leader change</comment> <payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="3F99" name="OP_DzSwitchInfo" updated="06/12/09"> + <opcode id="3841" name="OP_DzSwitchInfo" updated="08/12/09"> <comment></comment> <payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/> </opcode> - <opcode id="4661" name="OP_DzInfo" updated="06/12/09"> + <opcode id="1875" name="OP_DzInfo" updated="08/12/09"> <comment></comment> <payload dir="server" typename="dzInfo" sizechecktype="match"/> </opcode> - <opcode id="0507" name="OP_FormattedMessage" updated="06/12/09"> + <opcode id="48B8" name="OP_FormattedMessage" updated="08/12/09"> <comment>old FormattedMessageCode</comment> <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="2018" name="OP_ZoneEntry" updated="06/12/09"> - <comment>old ZoneEntryCode</comment> - <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/> - <payload dir="server" typename="uint8_t" sizechecktype="none"/> - </opcode> - <opcode id="0C7B" name="OP_SpawnDoor" updated="06/12/09"> + <opcode id="1AC1" name="OP_SpawnDoor" updated="08/12/09"> <comment>old DoorSpawnsCode</comment> <payload dir="server" typename="doorStruct" sizechecktype="modulus"/> </opcode> - <opcode id="4938" name="OP_SendZonePoints" updated="06/12/09"> - <comment>Coords in a zone that will port you to another zone</comment> - <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> - </opcode> - <opcode id="5658" name="OP_AAExpUpdate" updated="06/12/09"> + <opcode id="38D1" name="OP_AAExpUpdate" updated="08/12/09"> <comment>Receiving AA experience. Also when percent to AA changes.</comment> <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> - </opcode> <opcode id="053A" name="OP_AAExpUpdate" updated="05/14/09"> - <comment>Receiving AA experience. Also when percent to AA changes.</comment> - <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="2042" name="OP_GuildMOTD" updated="06/12/09"> - <comment>GuildMOTD</comment> - <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> - </opcode> - <opcode id="4B61" name="OP_HPUpdate" updated="06/12/09"> + <opcode id="5821" name="OP_HPUpdate" updated="08/12/09"> <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment> <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="3288" name="OP_GuildMemberUpdate" updated="06/12/09"> + <opcode id="16F5" name="OP_GuildMemberUpdate" updated="08/12/09"> <comment></comment> <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/> </opcode> - <opcode id="42EF" name="OP_SpawnRename" updated="06/12/09"> + <opcode id="37A7" name="OP_SpawnRename" updated="08/12/09"> <comment>Spawns getting renamed after initial NewSpawn</comment> <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/> </opcode> - <opcode id="2736" name="OP_GroupInvite" updated="06/12/09"> + <opcode id="099D" name="OP_GroupInvited" updated="08/12/09"> + <payload dir="server" typename="groupInviteStruct" sizechecktype="match"/> + <comment>You got invited to a group</comment> + </opcode> + <opcode id="7930" name="OP_GroupInvite" updated="08/12/09"> <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> - <payload dir="server" typename="groupAltInviteStruct" sizechecktype="match"/> <comment>You're inviting someone and you're not grouped</comment> </opcode> - <opcode id="517B" name="OP_SwapSpell" updated="06/12/09"> + <opcode id="1497" name="OP_SwapSpell" updated="08/12/09"> <comment>old TradeSpellBookSlotsCode</comment> <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/> </opcode> - <opcode id="6145" name="OP_InspectAnswer" updated="06/12/09"> - <comment>old InspectDataCode</comment> - <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> - </opcode> - <opcode id="783C" name="OP_SimpleMessage" updated="06/12/09"> + <opcode id="6884" name="OP_SimpleMessage" updated="08/12/09"> <comment>old SimpleMessageCode</comment> <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/> </opcode> - <opcode id="0525" name="OP_SpecialMesg" updated="06/12/09"> + <opcode id="429B" name="OP_SpecialMesg" updated="08/12/09"> <comment>Communicate textual info to client</comment> <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="0DDA" name="OP_RandomReq" updated="06/12/09"> + <opcode id="28A7" name="OP_RandomReq" updated="08/12/09"> <comment>old RandomReqCode</comment> <payload dir="client" typename="randomReqStruct" sizechecktype="match"/> </opcode> - <opcode id="5DBC" name="OP_ConsentResponse" updated="06/12/09"> + <opcode id="7113" name="OP_ConsentResponse" updated="08/12/09"> <comment>Server replying with consent information after /consent</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="771F" name="OP_DenyResponse" updated="06/12/09"> + <opcode id="1AC8" name="OP_DenyResponse" updated="08/12/09"> <comment>Server replying with deny information after /deny</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="50D0" name="OP_BazaarSearch" updated="06/12/09"> + <opcode id="60B5" name="OP_BazaarSearch" updated="08/12/09"> <payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/> <payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Bazaar search tool</comment> </opcode> + <opcode id="2B9D" name="OP_WearChange" updated="08/12/09"> + <comment>old SpawnUpdateCode</comment> + <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/> + </opcode> + <opcode id="03A9" name="OP_SpawnAppearance" updated="08/12/09"> + <comment>old SpawnAppearanceCode</comment> + <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/> + </opcode> + <opcode id="52B5" name="OP_Stamina" updated="08/12/09"> + <comment>Server updating on hunger/thirst</comment> + <payload dir="server" typename="staminaStruct" sizechecktype="match"/> + </opcode> + <opcode id="7452" name="OP_Consider" updated="08/12/09"> + <comment>old ConsiderCode</comment> + <payload dir="both" typename="considerStruct" sizechecktype="match"/> + </opcode> + <opcode id="24A3" name="OP_ZoneChange" updated="08/12/09"> + <comment>old ZoneChangeCode</comment> + <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/> + </opcode> + <opcode id="66C5" name="OP_Buff" updated="08/12/09"> + <comment>old BuffDropCode</comment> + <payload dir="both" typename="buffStruct" sizechecktype="match"/> + </opcode> + <opcode id="72F8" name="OP_Logout" updated="08/12/09"> + <comment></comment> + <payload dir="server" typename="none" sizechecktype="match"/> + </opcode> + + <opcode id="5251" name="OP_GroupInvite2" updated="06/12/09"> + <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> + <comment>You're inviting someone and you are grouped</comment> + </opcode> + <opcode id="2736" name="OP_GroupCancelInvite" updated="06/12/09"> + <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/> + <comment>Declining to join a group</comment> + </opcode> <opcode id="43AC" name="OP_NewZone" updated="06/12/09"> <comment>old NewZoneCode</comment> <payload dir="server" typename="newZoneStruct" sizechecktype="match"/> @@ -153,18 +194,6 @@ <comment>old NewCorpseCode</comment> <payload dir="server" typename="newCorpseStruct" sizechecktype="match"/> </opcode> - <opcode id="3969" name="OP_WearChange" updated="06/12/09"> - <comment>old SpawnUpdateCode</comment> - <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/> - </opcode> - <opcode id="4843" name="OP_SpawnAppearance" updated="06/12/09"> - <comment>old SpawnAppearanceCode</comment> - <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/> - </opcode> - <opcode id="70C6" name="OP_Stamina" updated="06/12/09"> - <comment>Server updating on hunger/thirst</comment> - <payload dir="server" typename="staminaStruct" sizechecktype="match"/> - </opcode> <opcode id="33E5" name="OP_ClickObject" updated="06/12/09"> <comment>old RemDropCode</comment> <payload dir="both" typename="remDropStruct" sizechecktype="match"/> @@ -178,34 +207,10 @@ <comment>old ActionCode</comment> <payload dir="both" typename="action2Struct" sizechecktype="match"/> </opcode> - <opcode id="66C5" name="OP_Consider" updated="06/12/09"> - <comment>old ConsiderCode</comment> - <payload dir="both" typename="considerStruct" sizechecktype="match"/> - </opcode> - <opcode id="2EE2" name="OP_TargetMouse" updated="06/12/09"> - <comment>Targeting a person - old ClientTargetCode</comment> - <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/> - </opcode> <opcode id="231F" name="OP_Illusion" updated="06/12/09"> <comment>Spawn being illusioned (changing forms)</comment> <payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/> </opcode> - <opcode id="32A9" name="OP_ZoneChange" updated="06/12/09"> - <comment>old ZoneChangeCode</comment> - <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/> - </opcode> - <opcode id="5251" name="OP_GroupInvite2" updated="06/12/09"> - <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> - <comment>You're inviting someone and you are grouped</comment> - </opcode> - <opcode id="5251" name="OP_GroupCancelInvite" updated="06/12/09"> - <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/> - <comment>Declining to join a group</comment> - </opcode> - <opcode id="7883" name="OP_Buff" updated="06/12/09"> - <comment>old BuffDropCode</comment> - <payload dir="both" typename="buffStruct" sizechecktype="match"/> - </opcode> <opcode id="71BF" name="OP_BuffFadeMsg" updated="06/12/09"> <comment>old SpellFadeCode</comment> <payload dir="both" typename="spellFadedStruct" sizechecktype="none"/> @@ -239,11 +244,6 @@ <comment>old CorpseLocCode:</comment> <payload dir="server" typename="corpseLocStruct" sizechecktype="match"/> </opcode> - <opcode id="7705" name="OP_Logout" updated="06/12/09"> - <comment></comment> - <payload dir="server" typename="none" sizechecktype="match"/> - </opcode> - <opcode id="6022" name="OP_PlayerProfile" updated="01/17/08"> <comment>old CharProfileCode</comment> <payload dir="server" typename="charProfileStruct" sizechecktype="match"/> @@ -290,14 +290,14 @@ <!-- Not necessary for SEQ to run but here to name packets in logs. - Also unverified as of 12-1-2007. --> - <opcode id="71b9" name="OP_SendAATable" updated="03/14/07"> + <opcode id="7598" name="OP_SendAATable" updated="06/12/09"> <comment></comment> </opcode> - <opcode id="6f05" name="OP_SendAAStats" updated="03/14/07"> + <opcode id="1ce3" name="OP_SendAAStats" updated="06/12/09"> <comment></comment> </opcode> + <!-- Below are unverified as of 12-1-2007 --> <opcode id="4d38" name="OP_AckPacket" updated="03/14/07"> <comment>Appears to be generic ack at the presentation level</comment> </opcode> Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-06-20 22:46:06 UTC (rev 733) +++ showeq/trunk/src/everquest.h 2009-08-17 00:06:27 UTC (rev 734) @@ -1555,19 +1555,38 @@ /* ** Channel Message received or sent -** Length: 148 Octets + Variable Length + 4 Octets +** Length: Variable ** OpCode: ChannelMessageCode + +This is how channelMessageStruct looks on the wire, for reference (8/12/09 eqgame.exe) + +char sender[0]; // Variable length senders name +char target[0]; // Variable length target characters name +uint32_t unknown; +uint32_t language; // Language +uint32_t chanNum; // Channel +uint32_t unknown; +uint8_t unknown; +uint32_t skillInLanguage; // senders skill in language +char message[0]; // Variable length message +uint8_t unknown; +uint32_t unknown; +uint32_t unknown; +char unknown[0]; // Variable legth unknown text +uint8_t unknown; +uint32_t unknown; + */ +// This will get filled with data from the serialized packet struct channelMessageStruct { -/*0000*/ char target[64]; // the target characters name -/*0064*/ char sender[64]; // The senders name -/*0128*/ uint32_t language; // Language -/*0132*/ uint32_t chanNum; // Channel -/*0136*/ int8_t unknown0136[8]; // ***Placeholder -/*0144*/ uint32_t skillInLanguage; // senders skill in language -/*0148*/ char message[0]; // Variable length message +/*0000*/ char sender[64]; +/*0064*/ char target[64]; +/*0128*/ uint32_t language; +/*0132*/ uint32_t chanNum; +/*0144*/ uint32_t skillInLanguage; +/*0148*/ char message[2048]; // Maximum message size according to eqgame.exe }; /* @@ -1710,14 +1729,6 @@ { /*0000*/ char invitee[64]; // Invitee's Name /*0064*/ char inviter[64]; // Inviter's Name -/*0128*/ uint8_t unknown0128[20]; // ***Placeholder -/*0148*/ -}; - -struct groupAltInviteStruct -{ -/*0000*/ char invitee[64]; // Invitee's Name -/*0064*/ char inviter[64]; // Inviter's Name /*0128*/ uint8_t unknown0128[24]; // ***Placeholder /*0152*/ }; Modified: showeq/trunk/src/interface.cpp =================================================================== --- showeq/trunk/src/interface.cpp 2009-06-20 22:46:06 UTC (rev 733) +++ showeq/trunk/src/interface.cpp 2009-08-17 00:06:27 UTC (rev 734) @@ -1858,9 +1858,9 @@ m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Client, "groupInviteStruct", SZC_Match, m_messageShell, SLOT(groupInvite(const uint8_t*))); - m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server, - "groupAltInviteStruct", SZC_Match, - m_messageShell, SLOT(groupInvite(const uint8_t*))); +// m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server, +// "groupAltInviteStruct", SZC_Match, +// m_messageShell, SLOT(groupInvite(const uint8_t*))); m_packet->connect2("OP_GroupInvite2", SP_Zone, DIR_Client, "groupInviteStruct", SZC_Match, m_messageShell, SLOT(groupInvite(const uint8_t*))); @@ -1988,9 +1988,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|DIR_Client, - "uint8_t", SZC_None, - m_spawnShell, SLOT(respawnFromHover(const uint8_t*, size_t, uint8_t))); +// m_packet->connect2("OP_RespawnFromHover", SP_Zone, DIR_Server|DIR_Client, +// "uint8_t", SZC_None, +// m_spawnShell, SLOT(respawnFromHover(const uint8_t*, size_t, 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))); Modified: showeq/trunk/src/messageshell.cpp =================================================================== --- showeq/trunk/src/messageshell.cpp 2009-06-20 22:46:06 UTC (rev 733) +++ showeq/trunk/src/messageshell.cpp 2009-08-17 00:06:27 UTC (rev 734) @@ -19,6 +19,7 @@ #include "packetcommon.h" #include "filtermgr.h" #include "util.h" +#include "netstream.h" //---------------------------------------------------------------------- // MessageShell @@ -36,10 +37,42 @@ { } -void MessageShell::channelMessage(const uint8_t* data, size_t, uint8_t dir) +void MessageShell::channelMessage(const uint8_t* data, size_t len, uint8_t dir) { - const channelMessageStruct* cmsg = (const channelMessageStruct*)data; +// Added for 8/12/09 patch for serialized message packet ---------------------- + QString qTmp; + NetStream netStream(data, len); + channelMessageStruct *cmsg = new channelMessageStruct; + memset(cmsg, 0, sizeof(channelMessageStruct)); + + qTmp = netStream.readText(); // sender + + if(qTmp.length()) + strcpy(cmsg->sender, qTmp.latin1()); + + qTmp = netStream.readText(); // target + + if(qTmp.length()) + strcpy(cmsg->target, qTmp.latin1()); + + netStream.readUInt32(); // unknown + + cmsg->language = netStream.readUInt32NC(); // language + + cmsg->chanNum = netStream.readUInt32NC(); // channel + + netStream.readUInt32(); // unknown + netStream.readUInt8(); // unknown + + cmsg->skillInLanguage = netStream.readUInt32NC(); // skill + + qTmp = netStream.readText(); // message + if(qTmp.length()) + strcpy(cmsg->message, qTmp.latin1()); + +//----------------------------------------------------------------------------- + // Tells and Group by us happen twice *shrug*. Ignore the client->server one. if (dir == DIR_Client && (cmsg->chanNum == MT_Tell || cmsg->chanNum == MT_Group)) @@ -93,6 +126,9 @@ } m_messages->addMessage((MessageType)cmsg->chanNum, tempStr); + + delete cmsg; + cmsg = 0; } static MessageType chatColor2MessageType(ChatColor chatColor) Modified: showeq/trunk/src/netstream.cpp =================================================================== --- showeq/trunk/src/netstream.cpp 2009-06-20 22:46:06 UTC (rev 733) +++ showeq/trunk/src/netstream.cpp 2009-08-17 00:06:27 UTC (rev 734) @@ -193,7 +193,7 @@ void NetStream::skipBytes(size_t byteCount) { - if ((m_lastPos - m_pos) >= byteCount) + if (uint32_t(m_lastPos - m_pos) >= byteCount) { m_pos += byteCount; } Modified: showeq/trunk/src/spawnshell.cpp =================================================================== --- showeq/trunk/src/spawnshell.cpp 2009-06-20 22:46:06 UTC (rev 733) +++ showeq/trunk/src/spawnshell.cpp 2009-08-17 00:06:27 UTC (rev 734) @@ -630,7 +630,7 @@ spawn->isMercenary = netStream.readUInt8(); // unknowns - netStream.skipBytes(24); + netStream.skipBytes(28); // now we're at the end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-06-20 22:46:07
|
Revision: 733 http://seq.svn.sourceforge.net/seq/?rev=733&view=rev Author: ieatacid Date: 2009-06-20 22:46:06 +0000 (Sat, 20 Jun 2009) Log Message: ----------- Tag for release 5.13.5.0 Added Paths: ----------- showeq/tags/v5_13_5_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-06-20 22:43:44
|
Revision: 732 http://seq.svn.sourceforge.net/seq/?rev=732&view=rev Author: ieatacid Date: 2009-06-20 22:43:42 +0000 (Sat, 20 Jun 2009) Log Message: ----------- Version to 5.13.5 + Updated opcodes + Updated structs Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/conf/zoneopcodes.xml showeq/trunk/configure.in showeq/trunk/src/everquest.h showeq/trunk/src/spawnshell.cpp Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-06-01 21:19:24 UTC (rev 731) +++ showeq/trunk/ChangeLog 2009-06-20 22:43:42 UTC (rev 732) @@ -1,3 +1,9 @@ +ieatacid (6/20/09) +----------------- +- Updated version to 5.13.5 +- Updated opcodes (6/12/09) +- Updated structs + ieatacid (5/25/09) ----------------- - Fixed guild name bug Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-06-01 21:19:24 UTC (rev 731) +++ showeq/trunk/conf/zoneopcodes.xml 2009-06-20 22:43:42 UTC (rev 732) @@ -5,265 +5,274 @@ <!-- Critical opcodes used directly by ShowEQ --> - <opcode id="2D95" name="OP_NpcMoveUpdate" updated="05/14/09"> + <opcode id="03D1" name="OP_NpcMoveUpdate" updated="06/12/09"> <comment>Position updates</comment> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="7AE3" name="OP_DeleteSpawn" updated="05/14/09"> + <opcode id="4036" name="OP_DeleteSpawn" updated="06/12/09"> <comment>old DeleteSpawnCode</comment> <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/> </opcode> - <opcode id="6130" name="OP_RespawnFromHover" updated="05/14/09"> + <opcode id="09E3" name="OP_RespawnFromHover" updated="06/12/09"> <comment>Server telling client that it is coming back from hover death</comment> <payload dir="both" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="1052" name="OP_Shroud" updated="05/14/09"> + <opcode id="48CD" name="OP_Shroud" updated="06/12/09"> <comment>Server putting players into shroud form</comment> <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/> </opcode> - <opcode id="2D08" name="OP_GroupFollow" updated="05/14/09"> + <opcode id="1C50" name="OP_GroupFollow" updated="06/12/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>You join a group</comment> </opcode> - <opcode id="08C3" name="OP_GroupFollow2" updated="05/14/09"> + <opcode id="49F6" name="OP_GroupFollow2" updated="06/12/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>Player joins your group</comment> </opcode> - <opcode id="C56C" name="OP_GroupUpdate" updated="05/14/09"> + <opcode id="4481" name="OP_GroupUpdate" updated="06/12/09"> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Variable length packet with group member names</comment> </opcode> - <opcode id="49F6" name="OP_GroupDisband" updated="05/14/09"> + <opcode id="0C33" name="OP_GroupDisband" updated="06/12/09"> <comment>You disband from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="21BE" name="OP_GroupDisband2" updated="05/14/09"> + <opcode id="58E6" name="OP_GroupDisband2" updated="06/12/09"> <comment>Other disbands from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="58E6" name="OP_GroupLeader" updated="05/14/09"> + <opcode id="63F8" name="OP_GroupLeader" updated="06/12/09"> <comment>Group leader change</comment> <payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="4B1E" name="OP_DzSwitchInfo" updated="05/14/09"> + <opcode id="3F99" name="OP_DzSwitchInfo" updated="06/12/09"> <comment></comment> <payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/> </opcode> - <opcode id="054E" name="OP_DzInfo" updated="05/14/09"> + <opcode id="4661" name="OP_DzInfo" updated="06/12/09"> <comment></comment> <payload dir="server" typename="dzInfo" sizechecktype="match"/> </opcode> - <opcode id="783C" name="OP_FormattedMessage" updated="05/14/09"> + <opcode id="0507" name="OP_FormattedMessage" updated="06/12/09"> <comment>old FormattedMessageCode</comment> <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="4D27" name="OP_ZoneEntry" updated="05/14/09"> + <opcode id="2018" name="OP_ZoneEntry" updated="06/12/09"> <comment>old ZoneEntryCode</comment> <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="4E19" name="OP_SpawnDoor" updated="05/14/09"> + <opcode id="0C7B" name="OP_SpawnDoor" updated="06/12/09"> <comment>old DoorSpawnsCode</comment> <payload dir="server" typename="doorStruct" sizechecktype="modulus"/> </opcode> - <opcode id="4892" name="OP_SendZonePoints" updated="05/14/09"> + <opcode id="4938" name="OP_SendZonePoints" updated="06/12/09"> <comment>Coords in a zone that will port you to another zone</comment> <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> </opcode> - <opcode id="053A" name="OP_AAExpUpdate" updated="05/14/09"> + <opcode id="5658" name="OP_AAExpUpdate" updated="06/12/09"> <comment>Receiving AA experience. Also when percent to AA changes.</comment> <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> </opcode> <opcode id="053A" name="OP_AAExpUpdate" updated="05/14/09"> <comment>Receiving AA experience. Also when percent to AA changes.</comment> <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="0B80" name="OP_GuildMOTD" updated="05/14/09"> + <opcode id="2042" name="OP_GuildMOTD" updated="06/12/09"> <comment>GuildMOTD</comment> <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> </opcode> - <opcode id="592D" name="OP_HPUpdate" updated="05/14/09"> + <opcode id="4B61" name="OP_HPUpdate" updated="06/12/09"> <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment> <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="1190" name="OP_GuildMemberUpdate" updated="05/14/09"> + <opcode id="3288" name="OP_GuildMemberUpdate" updated="06/12/09"> <comment></comment> <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/> </opcode> - <opcode id="38D1" name="OP_SpawnRename" updated="05/14/09"> + <opcode id="42EF" name="OP_SpawnRename" updated="06/12/09"> <comment>Spawns getting renamed after initial NewSpawn</comment> <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/> </opcode> - <opcode id="6893" name="OP_GroupInvite" updated="05/14/09"> + <opcode id="2736" name="OP_GroupInvite" updated="06/12/09"> <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> <payload dir="server" typename="groupAltInviteStruct" sizechecktype="match"/> <comment>You're inviting someone and you're not grouped</comment> </opcode> - <opcode id="224F" name="OP_SwapSpell" updated="05/14/09"> + <opcode id="517B" name="OP_SwapSpell" updated="06/12/09"> <comment>old TradeSpellBookSlotsCode</comment> <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/> </opcode> - <opcode id="6087" name="OP_InspectAnswer" updated="05/14/09"> + <opcode id="6145" name="OP_InspectAnswer" updated="06/12/09"> <comment>old InspectDataCode</comment> <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> </opcode> - <opcode id="1318" name="OP_SimpleMessage" updated="05/14/09"> + <opcode id="783C" name="OP_SimpleMessage" updated="06/12/09"> <comment>old SimpleMessageCode</comment> <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/> </opcode> - <opcode id="7B77" name="OP_SpecialMesg" updated="05/14/09"> + <opcode id="0525" name="OP_SpecialMesg" updated="06/12/09"> <comment>Communicate textual info to client</comment> <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="73D6" name="OP_RandomReq" updated="05/14/09"> + <opcode id="0DDA" name="OP_RandomReq" updated="06/12/09"> <comment>old RandomReqCode</comment> <payload dir="client" typename="randomReqStruct" sizechecktype="match"/> </opcode> - <opcode id="0C2D" name="OP_ConsentResponse" updated="05/14/09"> + <opcode id="5DBC" name="OP_ConsentResponse" updated="06/12/09"> <comment>Server replying with consent information after /consent</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="3675" name="OP_DenyResponse" updated="05/14/09"> + <opcode id="771F" name="OP_DenyResponse" updated="06/12/09"> <comment>Server replying with deny information after /deny</comment> <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> </opcode> - <opcode id="7092" name="OP_BazaarSearch" updated="05/14/09"> + <opcode id="50D0" name="OP_BazaarSearch" updated="06/12/09"> <payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/> <payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Bazaar search tool</comment> </opcode> - <opcode id="6022" name="OP_PlayerProfile" updated="01/17/08"> - <comment>old CharProfileCode</comment> - <payload dir="server" typename="charProfileStruct" sizechecktype="match"/> - </opcode> - <opcode id="6015" name="OP_TimeOfDay" updated="01/17/08"> - <comment>old TimeOfDayCode</comment> - <payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/> - </opcode> - <opcode id="5CA5" name="OP_NewZone" updated="01/17/08"> + <opcode id="43AC" name="OP_NewZone" updated="06/12/09"> <comment>old NewZoneCode</comment> <payload dir="server" typename="newZoneStruct" sizechecktype="match"/> </opcode> - <opcode id="33E5" name="OP_GroundSpawn" updated="01/17/08"> + <opcode id="5C85" name="OP_GroundSpawn" updated="06/12/09"> <comment>old MakeDropCode</comment> <payload dir="server" typename="makeDropStruct" sizechecktype="match"/> <payload dir="client" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="0E98" name="OP_ExpUpdate" updated="01/17/08"> + <opcode id="0555" name="OP_ExpUpdate" updated="06/12/09"> <comment>old ExpUpdateCode</comment> <payload dir="server" typename="expUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="51BC" name="OP_GuildMemberList" updated="01/17/08"> - <comment></comment> - <payload dir="server" typename="uint8_t" sizechecktype="none"/> - </opcode> - <opcode id="7062" name="OP_ClientUpdate" updated="01/17/08"> - <comment>Position updates</comment> - <payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/> - <payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/> - </opcode> - <opcode id="4656" name="OP_MobUpdate" updated="01/17/08"> - <comment>old MobUpdateCode</comment> - <payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/> - </opcode> - <opcode id="3164" name="OP_RemoveSpawn" updated="04/17/08"> + <opcode id="58C5" name="OP_RemoveSpawn" updated="06/12/09"> <comment>Remove spawn from zone</comment> <payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/> </opcode> - <opcode id="1B85" name="OP_Death" updated="01/17/08"> + <opcode id="7F9E" name="OP_Death" updated="06/12/09"> <comment>old NewCorpseCode</comment> <payload dir="server" typename="newCorpseStruct" sizechecktype="match"/> </opcode> - <opcode id="231F" name="OP_WearChange" updated="01/17/08"> + <opcode id="3969" name="OP_WearChange" updated="06/12/09"> <comment>old SpawnUpdateCode</comment> <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="10B7" name="OP_SpawnAppearance" updated="01/17/08"> + <opcode id="4843" name="OP_SpawnAppearance" updated="06/12/09"> <comment>old SpawnAppearanceCode</comment> <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/> </opcode> - <opcode id="3E50" name="OP_Stamina" updated="10/21/08"> + <opcode id="70C6" name="OP_Stamina" updated="06/12/09"> <comment>Server updating on hunger/thirst</comment> <payload dir="server" typename="staminaStruct" sizechecktype="match"/> </opcode> - <opcode id="5F0D" name="OP_ClickObject" updated="01/17/08"> + <opcode id="33E5" name="OP_ClickObject" updated="06/12/09"> <comment>old RemDropCode</comment> <payload dir="both" typename="remDropStruct" sizechecktype="match"/> </opcode> - <opcode id="2C27" name="OP_Action" updated="01/17/08"> + <opcode id="0F14" name="OP_Action" updated="06/12/09"> <comment></comment> <payload dir="both" typename="actionStruct" sizechecktype="match"/> <payload dir="both" typename="actionAltStruct" sizechecktype="match"/> </opcode> - <opcode id="7E4D" name="OP_Action2" updated="01/17/08"> + <opcode id="631A" name="OP_Action2" updated="06/12/09"> <comment>old ActionCode</comment> <payload dir="both" typename="action2Struct" sizechecktype="match"/> </opcode> - <opcode id="6024" name="OP_Consider" updated="01/17/08"> + <opcode id="66C5" name="OP_Consider" updated="06/12/09"> <comment>old ConsiderCode</comment> <payload dir="both" typename="considerStruct" sizechecktype="match"/> </opcode> - <opcode id="7BBB" name="OP_TargetMouse" updated="01/17/08"> + <opcode id="2EE2" name="OP_TargetMouse" updated="06/12/09"> <comment>Targeting a person - old ClientTargetCode</comment> <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/> </opcode> - <opcode id="48F9" name="OP_Illusion" updated="01/17/08"> + <opcode id="231F" name="OP_Illusion" updated="06/12/09"> <comment>Spawn being illusioned (changing forms)</comment> <payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/> </opcode> - <opcode id="051B" name="OP_ZoneChange" updated="01/17/08"> + <opcode id="32A9" name="OP_ZoneChange" updated="06/12/09"> <comment>old ZoneChangeCode</comment> <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="548c" name="OP_GroupInvite2" updated="09/03/08"> + <opcode id="5251" name="OP_GroupInvite2" updated="06/12/09"> <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> <comment>You're inviting someone and you are grouped</comment> </opcode> - <opcode id="5251" name="OP_GroupCancelInvite" updated="01/17/08"> + <opcode id="5251" name="OP_GroupCancelInvite" updated="06/12/09"> <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/> <comment>Declining to join a group</comment> </opcode> - <opcode id="7EA8" name="OP_Buff" updated="01/17/08"> + <opcode id="7883" name="OP_Buff" updated="06/12/09"> <comment>old BuffDropCode</comment> <payload dir="both" typename="buffStruct" sizechecktype="match"/> </opcode> - <opcode id="569A" name="OP_BuffFadeMsg" updated="01/17/08"> + <opcode id="71BF" name="OP_BuffFadeMsg" updated="06/12/09"> <comment>old SpellFadeCode</comment> <payload dir="both" typename="spellFadedStruct" sizechecktype="none"/> </opcode> - <opcode id="0D5A" name="OP_BeginCast" updated="01/17/08"> - <comment>old BeginCastCode</comment> - <payload dir="both" typename="beginCastStruct" sizechecktype="match"/> - </opcode> - <opcode id="3582" name="OP_CastSpell" updated="01/17/08"> + <opcode id="50C2" name="OP_CastSpell" updated="06/12/09"> <comment>old StartCastCode</comment> <payload dir="both" typename="startCastStruct" sizechecktype="match"/> </opcode> - <opcode id="8543" name="OP_MemorizeSpell" updated="01/17/08"> + <opcode id="3887" name="OP_MemorizeSpell" updated="06/12/09"> <comment>old MemSpellCode</comment> <payload dir="both" typename="memSpellStruct" sizechecktype="match"/> </opcode> - <opcode id="7434" name="OP_Emote" updated="01/17/08"> + <opcode id="3164" name="OP_Emote" updated="06/12/09"> <comment>old EmoteTextCode</comment> <payload dir="both" typename="emoteTextStruct" sizechecktype="none"/> </opcode> - <opcode id="2E79" name="OP_CommonMessage" updated="01/17/08"> - <comment>old ChannelMessageCode</comment> - <payload dir="both" typename="channelMessageStruct" sizechecktype="none"/> - </opcode> - <opcode id="6CDC" name="OP_RandomReply" updated="01/17/08"> + <opcode id="6D5D" name="OP_RandomReply" updated="06/12/09"> <comment>old RandomCode</comment> <payload dir="server" typename="randomStruct" sizechecktype="match"/> </opcode> - <opcode id="50C2" name="OP_ManaChange" updated="01/17/08"> + <opcode id="569A" name="OP_ManaChange" updated="06/12/09"> <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"/> </opcode> - <opcode id="6546" name="OP_MoneyOnCorpse" updated="01/17/08"> + <opcode id="4A83" name="OP_MoneyOnCorpse" updated="06/12/09"> <comment>old MoneyOnCorpseCode</comment> <payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/> </opcode> + <opcode id="132F" name="OP_CorpseLocResponse" updated="06/12/09"> + <comment>old CorpseLocCode:</comment> + <payload dir="server" typename="corpseLocStruct" sizechecktype="match"/> + </opcode> + <opcode id="7705" name="OP_Logout" updated="06/12/09"> + <comment></comment> + <payload dir="server" typename="none" sizechecktype="match"/> + </opcode> + + <opcode id="6022" name="OP_PlayerProfile" updated="01/17/08"> + <comment>old CharProfileCode</comment> + <payload dir="server" typename="charProfileStruct" sizechecktype="match"/> + </opcode> + <opcode id="6015" name="OP_TimeOfDay" updated="01/17/08"> + <comment>old TimeOfDayCode</comment> + <payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/> + </opcode> + <opcode id="51BC" name="OP_GuildMemberList" updated="01/17/08"> + <comment></comment> + <payload dir="server" typename="uint8_t" sizechecktype="none"/> + </opcode> + <opcode id="7062" name="OP_ClientUpdate" updated="01/17/08"> + <comment>Position updates</comment> + <payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/> + <payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/> + </opcode> + <opcode id="4656" name="OP_MobUpdate" updated="01/17/08"> + <comment>old MobUpdateCode</comment> + <payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/> + </opcode> + <opcode id="0D5A" name="OP_BeginCast" updated="01/17/08"> + <comment>old BeginCastCode</comment> + <payload dir="both" typename="beginCastStruct" sizechecktype="match"/> + </opcode> + <opcode id="2E79" name="OP_CommonMessage" updated="01/17/08"> + <comment>old ChannelMessageCode</comment> + <payload dir="both" typename="channelMessageStruct" sizechecktype="none"/> + </opcode> <opcode id="7F01" name="OP_SkillUpdate" updated="01/17/08"> <comment>old SkillIncCode</comment> <payload dir="server" typename="skillIncStruct" sizechecktype="match"/> @@ -272,14 +281,7 @@ <comment>old LevelUpUpdateCode</comment> <payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/> </opcode> - <opcode id="083B" name="OP_CorpseLocResponse" updated="01/17/08"> - <comment>old CorpseLocCode:</comment> - <payload dir="server" typename="corpseLocStruct" sizechecktype="match"/> - </opcode> - <opcode id="30E2" name="OP_Logout" updated="10/21/08"> - <comment></comment> - <payload dir="server" typename="none" sizechecktype="match"/> - </opcode> + <!-- Deprecated <opcode id="5C29" name="OP_NewSpawn" updated="01/17/08"> <comment>old NewSpawnCode</comment> Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-06-01 21:19:24 UTC (rev 731) +++ showeq/trunk/configure.in 2009-06-20 22:43:42 UTC (rev 732) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.4.1) +AC_INIT(showeq, 5.13.5.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-06-01 21:19:24 UTC (rev 731) +++ showeq/trunk/src/everquest.h 2009-06-20 22:43:42 UTC (rev 732) @@ -101,14 +101,14 @@ #define RTEAM_OTHER 5 //Maximum limits of certain types of data -#define MAX_KNOWN_SKILLS 75 +#define MAX_KNOWN_SKILLS 100 #define MAX_SPELL_SLOTS 10 #define MAX_KNOWN_LANGS 25 #define MAX_SPELLBOOK_SLOTS 400 #define MAX_GROUP_MEMBERS 6 -#define MAX_BUFFS 25 +#define MAX_BUFFS 30 #define MAX_GUILDS 1500 -#define MAX_AA 359 +#define MAX_AA 300 #define MAX_BANDOLIERS 20 #define MAX_POTIONS_IN_BELT 5 #define MAX_TRIBUTES 5 @@ -446,13 +446,14 @@ /* * Used in charProfileStruct - * Size: 8 octets + * Size: 12 octets */ struct AA_Array { /*000*/ uint32_t AA; /*004*/ uint32_t value; -/*008*/ +/*008*/ uint32_t unknown008; +/*012*/ }; /** @@ -663,148 +664,146 @@ /*00060*/ BindStruct binds[5]; // Bind points (primary is first) /*00160*/ uint32_t deity; // deity /*00164*/ uint32_t intoxication; // Alcohol level (in ticks till sober?) -/*00168*/ uint32_t spellSlotRefresh[MAX_SPELL_SLOTS]; // Refresh time (millis) -/*00208*/ uint8_t unknown0208[4]; -/*00212*/ uint8_t haircolor; // Player hair color -/*00213*/ uint8_t beardcolor; // Player beard color -/*00214*/ uint8_t unknown00214[6]; -/*00220*/ uint8_t eyecolor1; // Player left eye color -/*00221*/ uint8_t eyecolor2; // Player right eye color -/*00222*/ uint8_t hairstyle; // Player hair style -/*00223*/ uint8_t beard; // Player beard type -/*00224*/ uint8_t unknown00218[12]; -/*00236*/ uint32_t item_material[9]; // Item texture/material of worn items -/*00272*/ uint8_t unknown00272[232]; -/*00504*/ Color_Struct item_tint[9]; // RR GG BB 00 -/*00540*/ AA_Array aa_array[MAX_AA]; // AAs -/*03412*/ uint8_t unknown03400[728]; // ***** this may be wrong or aa_array might be wrong (10/21/07) -/*04140*/ uint32_t points; // Unspent Practice points -/*04144*/ uint32_t MANA; // Current MANA -/*04148*/ uint32_t curHp; // Current HP without +HP equipment -/*04152*/ uint32_t STR; // Strength -/*04156*/ uint32_t STA; // Stamina -/*04160*/ uint32_t CHA; // Charisma -/*04164*/ uint32_t DEX; // Dexterity -/*04168*/ uint32_t INT; // Intelligence -/*04172*/ uint32_t AGI; // Agility -/*04176*/ uint32_t WIS; // Wisdom -/*04180*/ uint8_t face; // Player face -/*04181*/ uint8_t unknown04181[175]; -/*04356*/ int32_t sSpellBook[400]; // List of the Spells in spellbook -/*05956*/ uint8_t unknown5956[448]; // all 0xff after last spell -/*06404*/ int32_t sMemSpells[MAX_SPELL_SLOTS]; // List of spells memorized -/*06444*/ uint8_t unknown06444[28]; -/*06472*/ uint32_t platinum; // Platinum Pieces on player -/*06476*/ uint32_t gold; // Gold Pieces on player -/*06480*/ uint32_t silver; // Silver Pieces on player -/*06484*/ uint32_t copper; // Copper Pieces on player -/*06488*/ uint32_t platinum_cursor; // Platinum Pieces on cursor -/*06492*/ uint32_t gold_cursor; // Gold Pieces on cursor -/*06496*/ uint32_t silver_cursor; // Silver Pieces on cursor -/*06500*/ uint32_t copper_cursor; // Copper Pieces on cursor -/*06504*/ uint32_t skills[MAX_KNOWN_SKILLS]; // List of skills -/*06804*/ uint8_t unknown06804[236]; -/*07040*/ uint32_t toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) -/*07044*/ uint32_t thirst; // Drink (ticks till next drink) -/*07048*/ uint32_t hunger; // Food (ticks till next eat) -/*07052*/ spellBuff buffs[MAX_BUFFS]; // Buffs currently on the player -/*07652*/ uint32_t disciplines[MAX_DISCIPLINES]; // Known disciplines -/*08052*/ uint8_t unknown08052[160]; -/*08212*/ uint32_t recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use) -/*08292*/ uint32_t endurance; // Current endurance -/*08296*/ uint32_t aa_spent; // Number of spent AA points -/*08300*/ uint32_t aa_unspent; // Unspent AA points -/*08304*/ uint8_t unknown08304[4]; -/*08308*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents -/*14708*/ InlineItem potionBelt[MAX_POTIONS_IN_BELT]; // potion belt -/*15068*/ uint8_t unknown15068[92]; -/*15160*/ +/*00168*/ uint32_t spellSlotRefresh[13]; // Refresh time (millis) +/*00220*/ uint8_t haircolor; // Player hair color +/*00221*/ uint8_t beardcolor; // Player beard color +/*00222*/ uint8_t unknown00222[6]; +/*00228*/ uint8_t eyecolor1; // Player left eye color +/*00229*/ uint8_t eyecolor2; // Player right eye color +/*00230*/ uint8_t hairstyle; // Player hair style +/*00231*/ uint8_t beard; // Player beard type +/*00232*/ uint8_t unknown00232[22]; +/*00254*/ uint32_t item_material[9]; // Item texture/material of worn items +/*00290*/ uint8_t unknown00290[222]; +/*00512*/ Color_Struct item_tint[9]; // RR GG BB 00 +/*00548*/ AA_Array aa_array[MAX_AA]; // AAs +/*04148*/ uint32_t points; // Unspent Practice points +/*04152*/ uint32_t MANA; // Current MANA +/*04156*/ uint32_t curHp; // Current HP without +HP equipment +/*04160*/ uint32_t STR; // Strength +/*04164*/ uint32_t STA; // Stamina +/*04168*/ uint32_t CHA; // Charisma +/*04172*/ uint32_t DEX; // Dexterity +/*04176*/ uint32_t INT; // Intelligence +/*04180*/ uint32_t AGI; // Agility +/*04184*/ uint32_t WIS; // Wisdom +/*04188*/ uint8_t face; // Player face +/*04189*/ uint8_t unknown04189[175]; +/*04364*/ int32_t sSpellBook[720]; // List of the Spells in spellbook +/*07244*/ int32_t sMemSpells[MAX_SPELL_SLOTS]; // List of spells memorized +/*07284*/ uint8_t unknown07284[28]; +/*07312*/ uint32_t platinum; // Platinum Pieces on player +/*07316*/ uint32_t gold; // Gold Pieces on player +/*07320*/ uint32_t silver; // Silver Pieces on player +/*07324*/ uint32_t copper; // Copper Pieces on player +/*07328*/ uint32_t platinum_cursor; // Platinum Pieces on cursor +/*07332*/ uint32_t gold_cursor; // Gold Pieces on cursor +/*07336*/ uint32_t silver_cursor; // Silver Pieces on cursor +/*07340*/ uint32_t copper_cursor; // Copper Pieces on cursor +/*07344*/ uint32_t skills[MAX_KNOWN_SKILLS]; // List of skills +/*07744*/ uint32_t innateSkills[25]; +/*07844*/ uint8_t unknown07844[36]; +/*07880*/ uint32_t toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) +/*07884*/ uint32_t thirst; // Drink (ticks till next drink) +/*07888*/ uint32_t hunger; // Food (ticks till next eat) +/*07892*/ spellBuff buffs[MAX_BUFFS]; // Buffs currently on the player +/*08612*/ uint32_t disciplines[MAX_DISCIPLINES]; // Known disciplines +/*09012*/ uint8_t unknown09012[560]; +/*09572*/ uint32_t recastTimers[MAX_RECAST_TYPES]; // Timers (GMT of last use) +/*09652*/ uint32_t endurance; // Current endurance +/*09656*/ uint32_t aa_spent; // Number of spent AA points +/*09660*/ uint32_t aa_unspent; // Unspent AA points +/*09664*/ uint8_t unknown09664[4]; +/*09668*/ BandolierStruct bandoliers[MAX_BANDOLIERS]; // bandolier contents +/*16068*/ InlineItem potionBelt[MAX_POTIONS_IN_BELT]; // potion belt +/*16428*/ uint8_t unknown16428[92]; +/*16520*/ }; /* ** Player Profile -** Length: 23496 Octets +** Length: 24856 Octets ** OpCode: CharProfileCode */ struct charProfileStruct { /*00000*/ uint32_t checksum; // /*00004*/ playerProfileStruct profile; // Profile -/*15160*/ char name[64]; // Name of player -/*15224*/ char lastName[32]; // Last name of player -/*15256*/ uint8_t unknown15256[12]; //***Placeholder (1/18/2006) -/*15268*/ int32_t guildID; // guildID -/*15272*/ uint32_t birthdayTime; // character birthday -/*15276*/ uint32_t lastSaveTime; // character last save time -/*15280*/ uint32_t timePlayedMin; // time character played -/*15284*/ uint8_t unknown15284[4]; -/*15288*/ uint8_t pvp; // 1=pvp, 0=not pvp -/*15289*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon -/*15290*/ uint8_t gm; // 0=no, 1=yes (guessing!) -/*15291*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader -/*15292*/ uint8_t unknown15292[8]; -/*15300*/ uint32_t exp; // Current Experience -/*15304*/ uint8_t unknown15304[12]; -/*15316*/ uint8_t languages[MAX_KNOWN_LANGS]; // List of languages -/*15341*/ uint8_t unknown15341[7]; // All 0x00 (language buffer?) -/*15348*/ float y; // Players y position -/*15352*/ float x; // Players x position -/*15356*/ float z; // Players z position -/*15360*/ float heading; // Players heading -/*15364*/ uint32_t standState; // 0x64 = stand -/*15368*/ uint32_t platinum_bank; // Platinum Pieces in Bank -/*15372*/ uint32_t gold_bank; // Gold Pieces in Bank -/*15376*/ uint32_t silver_bank; // Silver Pieces in Bank -/*15380*/ uint32_t copper_bank; // Copper Pieces in Bank -/*15384*/ uint32_t platinum_shared; // Shared platinum pieces -/*15388*/ uint8_t unknown15388[1036]; -/*16424*/ uint32_t expansions; // Bitmask for expansions -/*16428*/ uint8_t unknown16428[12]; -/*16440*/ uint32_t autosplit; // 0 = off, 1 = on -/*16444*/ uint8_t unknown16444[16]; -/*16460*/ uint16_t zoneId; // see zones.h -/*16462*/ uint16_t zoneInstance; // Instance id -/*16464*/ uint8_t unknown16464[800]; -/*17264*/ uint32_t leadAAActive; // 0 = leader AA off, 1 = leader AA on -/*17268*/ uint8_t unknown17268[4]; -/*17272*/ uint32_t ldon_guk_points; // Earned GUK points -/*17276*/ uint32_t ldon_mir_points; // Earned MIR points -/*17280*/ uint32_t ldon_mmc_points; // Earned MMC points -/*17284*/ uint32_t ldon_ruj_points; // Earned RUJ points -/*17288*/ uint32_t ldon_tak_points; // Earned TAK points -/*17292*/ uint32_t ldon_avail_points; // Available LDON points -/*17296*/ uint8_t unknown17296[136]; -/*17432*/ uint32_t tributeTime; // Time remaining on tribute (millisecs) -/*17436*/ uint32_t careerTribute; // Total favor points for this char -/*17440*/ uint32_t unknown17432; // *** Placeholder -/*17444*/ uint32_t currentTribute; // Current tribute points -/*17448*/ uint32_t unknown17440; // *** Placeholder -/*17452*/ uint32_t tributeActive; // 0 = off, 1=on -/*17456*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout -/*17496*/ uint8_t unknown17496[4]; -/*17500*/ float expGroupLeadAA; // Current group lead exp points -/*17504*/ uint32_t unknown17504; -/*17508*/ float expRaidLeadAA; // Current raid lead AA exp points -/*17512*/ uint32_t unknown17512; -/*17516*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points -/*17520*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points -/*17524*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks -/*17652*/ uint8_t unknown17644[128]; -/*17780*/ uint32_t airRemaining; // Air supply (seconds) -/*17784*/ uint8_t unknown17784[4608]; -/*22392*/ uint32_t expAA; // Exp earned in current AA point -/*22396*/ uint8_t unknown22396[40]; -/*22436*/ uint32_t currentRadCrystals; // Current count of radiant crystals -/*22440*/ uint32_t careerRadCrystals; // Total count of radiant crystals ever -/*22444*/ uint32_t currentEbonCrystals;// Current count of ebon crystals -/*22448*/ uint32_t careerEbonCrystals; // Total count of ebon crystals ever -/*22452*/ uint8_t groupAutoconsent; // 0=off, 1=on -/*22453*/ uint8_t raidAutoconsent; // 0=off, 1=on -/*22454*/ uint8_t guildAutoconsent; // 0=off, 1=on -/*22455*/ uint8_t unknown22455[5]; // ***Placeholder (6/29/2005) -/*22460*/ uint32_t showhelm; // 0=no, 1=yes -/*22464*/ uint8_t unknown22464[1032]; // ***Placeholder (2/13/2007) -/*23496*/ +/*16520*/ char name[64]; // Name of player +/*16584*/ char lastName[32]; // Last name of player +/*16616*/ uint8_t unknown16616[12]; //***Placeholder (1/18/2006) +/*16628*/ int32_t guildID; // guildID +/*16632*/ uint32_t birthdayTime; // character birthday +/*16636*/ uint32_t lastSaveTime; // character last save time +/*16640*/ uint32_t timePlayedMin; // time character played +/*16644*/ uint8_t unknown16644[4]; +/*16648*/ uint8_t pvp; // 1=pvp, 0=not pvp +/*16649*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon +/*16650*/ uint8_t gm; // 0=no, 1=yes (guessing!) +/*16651*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader +/*16652*/ uint8_t unknown16652[8]; +/*16660*/ uint32_t exp; // Current Experience +/*16664*/ uint8_t unknown16664[12]; +/*16676*/ uint8_t languages[MAX_KNOWN_LANGS]; // List of languages +/*16701*/ uint8_t unknown16701[7]; // All 0x00 (language buffer?) +/*16708*/ float y; // Players y position +/*16712*/ float x; // Players x position +/*16716*/ float z; // Players z position +/*16720*/ float heading; // Players heading +/*16724*/ uint32_t standState; // 0x64 = stand +/*16728*/ uint32_t platinum_bank; // Platinum Pieces in Bank +/*16732*/ uint32_t gold_bank; // Gold Pieces in Bank +/*16736*/ uint32_t silver_bank; // Silver Pieces in Bank +/*16740*/ uint32_t copper_bank; // Copper Pieces in Bank +/*16744*/ uint32_t platinum_shared; // Shared platinum pieces +/*16748*/ uint8_t unknown16748[1036]; +/*17784*/ uint32_t expansions; // Bitmask for expansions +/*17788*/ uint8_t unknown17788[12]; +/*17800*/ uint32_t autosplit; // 0 = off, 1 = on +/*17804*/ uint8_t unknown17804[16]; +/*17820*/ uint16_t zoneId; // see zones.h +/*17822*/ uint16_t zoneInstance; // Instance id +/*17824*/ uint8_t unknown17824[800]; +/*18624*/ uint32_t leadAAActive; // 0 = leader AA off, 1 = leader AA on +/*18628*/ uint8_t unknown18628[4]; +/*18632*/ uint32_t ldon_guk_points; // Earned GUK points +/*18636*/ uint32_t ldon_mir_points; // Earned MIR points +/*18640*/ uint32_t ldon_mmc_points; // Earned MMC points +/*18644*/ uint32_t ldon_ruj_points; // Earned RUJ points +/*18648*/ uint32_t ldon_tak_points; // Earned TAK points +/*18652*/ uint32_t ldon_avail_points; // Available LDON points +/*18656*/ uint8_t unknown18656[136]; +/*18792*/ uint32_t tributeTime; // Time remaining on tribute (millisecs) +/*18796*/ uint32_t careerTribute; // Total favor points for this char +/*18800*/ uint32_t unknown18800; // *** Placeholder +/*18804*/ uint32_t currentTribute; // Current tribute points +/*18808*/ uint32_t unknown18808; // *** Placeholder +/*18812*/ uint32_t tributeActive; // 0 = off, 1=on +/*18816*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout +/*18856*/ uint8_t unknown18856[4]; +/*18860*/ float expGroupLeadAA; // Current group lead exp points +/*18864*/ uint32_t unknown18864; +/*18868*/ float expRaidLeadAA; // Current raid lead AA exp points +/*18872*/ uint32_t unknown18872; +/*18876*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points +/*18880*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points +/*18884*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks +/*19012*/ uint8_t unknown19012[128]; +/*19140*/ uint32_t airRemaining; // Air supply (seconds) +/*19144*/ uint8_t unknown19144[4608]; +/*23752*/ uint32_t expAA; // Exp earned in current AA point +/*23756*/ uint8_t unknown23756[40]; +/*23796*/ uint32_t currentRadCrystals; // Current count of radiant crystals +/*23800*/ uint32_t careerRadCrystals; // Total count of radiant crystals ever +/*23804*/ uint32_t currentEbonCrystals;// Current count of ebon crystals +/*23808*/ uint32_t careerEbonCrystals; // Total count of ebon crystals ever +/*23812*/ uint8_t groupAutoconsent; // 0=off, 1=on +/*23813*/ uint8_t raidAutoconsent; // 0=off, 1=on +/*23814*/ uint8_t guildAutoconsent; // 0=off, 1=on +/*23815*/ uint8_t unknown23815[5]; // ***Placeholder (6/29/2005) +/*23820*/ uint32_t showhelm; // 0=no, 1=yes +/*23824*/ uint8_t unknown23824[1032]; // ***Placeholder (2/13/2007) +/*24856*/ }; #if 0 Modified: showeq/trunk/src/spawnshell.cpp =================================================================== --- showeq/trunk/src/spawnshell.cpp 2009-06-01 21:19:24 UTC (rev 731) +++ showeq/trunk/src/spawnshell.cpp 2009-06-20 22:43:42 UTC (rev 732) @@ -638,7 +638,7 @@ if(checkLen && (int32_t)len != retVal) { - seqDebug("SpawnShell::fillSpawnStruct - expected length: %d, read: %d", len, retVal); + seqDebug("SpawnShell::fillSpawnStruct - expected length: %d, read: %d for spawn '%s'", len, retVal, spawn->name); } return retVal; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-06-01 21:19:42
|
Revision: 731 http://seq.svn.sourceforge.net/seq/?rev=731&view=rev Author: ieatacid Date: 2009-06-01 21:19:24 +0000 (Mon, 01 Jun 2009) Log Message: ----------- Added isMercenary to spawnStruct and adjusted fillSpawnStruct function to fill it + Fixed some text formatting in fillSpawnStruct Modified Paths: -------------- showeq/trunk/src/everquest.h showeq/trunk/src/spawnshell.cpp Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-05-26 01:32:46 UTC (rev 730) +++ showeq/trunk/src/everquest.h 2009-06-01 21:19:24 UTC (rev 731) @@ -1092,6 +1092,7 @@ }; /*0000*/ char title[32]; /*0000*/ char suffix[32]; +/*0000*/ uint8_t isMercenary; }; #if 0 @@ -1220,7 +1221,9 @@ /*0000*/ char title[0]; // only read if(hasTitleOrSuffix & 4) /*0000*/ char suffix[0]; // only read if(hasTitleOrSuffix & 8) -/*0000*/ char unknown20[32]; +/*0000*/ char unknown20[8]; +/*0000*/ uint8_t isMercenary; +/*0000*/ char unknown20[24]; }; #endif Modified: showeq/trunk/src/spawnshell.cpp =================================================================== --- showeq/trunk/src/spawnshell.cpp 2009-05-26 01:32:46 UTC (rev 730) +++ showeq/trunk/src/spawnshell.cpp 2009-06-01 21:19:24 UTC (rev 731) @@ -486,28 +486,28 @@ This reads data from the variable-length spawn struct */ - NetStream netStream(data,len); + NetStream netStream(data, len); int32_t retVal; uint32_t race; uint8_t i; - QString name=netStream.readText(); + QString name = netStream.readText(); if(name.length()) - strcpy(spawn->name,name.latin1()); + strcpy(spawn->name, name.latin1()); - spawn->spawnId=netStream.readUInt32NC(); + spawn->spawnId = netStream.readUInt32NC(); - spawn->level=netStream.readUInt8(); + spawn->level = netStream.readUInt8(); // skip the next 4 bytes netStream.skipBytes(4); - spawn->NPC=netStream.readUInt8(); + spawn->NPC = netStream.readUInt8(); - spawn->miscData=netStream.readUInt32NC(); + spawn->miscData = netStream.readUInt32NC(); - spawn->otherData=netStream.readUInt8(); + spawn->otherData = netStream.readUInt8(); // skip unknown3, unknown4 netStream.skipBytes(8); @@ -517,15 +517,15 @@ // it's a chest or untargetable do - i=netStream.readUInt8(); + i = netStream.readUInt8(); while(i); do - i=netStream.readUInt8(); + i = netStream.readUInt8(); while(i); do - i=netStream.readUInt8(); + i = netStream.readUInt8(); while(i); // skip next 3 longs @@ -544,95 +544,101 @@ // skip facestyle, walk/run speeds, unknown5 netStream.skipBytes(13); - spawn->race=netStream.readUInt32NC(); + spawn->race = netStream.readUInt32NC(); - spawn->charProperties=netStream.readUInt8(); + spawn->charProperties = netStream.readUInt8(); if(spawn->charProperties) { - spawn->bodytype=netStream.readUInt32NC(); + spawn->bodytype = netStream.readUInt32NC(); - for(i=1; i < spawn->charProperties; i++) + for(i = 1; i < spawn->charProperties; i++) { // extra character properties netStream.skipBytes(4); } } - spawn->curHp=netStream.readUInt8(); + spawn->curHp = netStream.readUInt8(); // skip hair and face stuff netStream.skipBytes(18); - spawn->holding=netStream.readUInt8(); - spawn->deity=netStream.readUInt32NC(); - spawn->guildID=netStream.readUInt32NC(); - spawn->guildstatus=netStream.readUInt32NC(); - spawn->class_=netStream.readUInt8(); + spawn->holding = netStream.readUInt8(); + spawn->deity = netStream.readUInt32NC(); + spawn->guildID = netStream.readUInt32NC(); + spawn->guildstatus = netStream.readUInt32NC(); + spawn->class_ = netStream.readUInt8(); netStream.skipBytes(1); - spawn->state=netStream.readUInt8(); - spawn->light=netStream.readUInt8(); + spawn->state = netStream.readUInt8(); + spawn->light = netStream.readUInt8(); netStream.skipBytes(5); - name=netStream.readText(); + name = netStream.readText(); if(name.length()) { - strcpy(spawn->lastName,name.latin1()); + strcpy(spawn->lastName, name.latin1()); } netStream.skipBytes(5); - spawn->petOwnerId=netStream.readUInt32NC(); + spawn->petOwnerId = netStream.readUInt32NC(); netStream.skipBytes(25); - spawn->posData[0]=netStream.readUInt32NC(); - spawn->posData[1]=netStream.readUInt32NC(); - spawn->posData[2]=netStream.readUInt32NC(); - spawn->posData[3]=netStream.readUInt32NC(); - spawn->posData[4]=netStream.readUInt32NC(); + spawn->posData[0] = netStream.readUInt32NC(); + spawn->posData[1] = netStream.readUInt32NC(); + spawn->posData[2] = netStream.readUInt32NC(); + spawn->posData[3] = netStream.readUInt32NC(); + spawn->posData[4] = netStream.readUInt32NC(); // skip color netStream.skipBytes(36); - race=spawn->race; + race = spawn->race; // this is how the client checks if equipment should be read. - if(spawn->NPC==0 || race <= 12 || race==128 || race==130 || race==330 || race==522) + if(spawn->NPC == 0 || race <= 12 || race == 128 || race == 130 || race == 330 || race == 522) { - for(i=0; i<9; i++) + for(i = 0; i < 9; i++) { - spawn->equipment[i].itemId=netStream.readUInt32NC(); - spawn->equipment[i].equip1=netStream.readUInt32NC(); - spawn->equipment[i].equip0=netStream.readUInt32NC(); + spawn->equipment[i].itemId = netStream.readUInt32NC(); + spawn->equipment[i].equip1 = netStream.readUInt32NC(); + spawn->equipment[i].equip0 = netStream.readUInt32NC(); } } if(spawn->otherData & 4) { - name=netStream.readText(); - strcpy(spawn->title,name.latin1()); + name = netStream.readText(); + strcpy(spawn->title, name.latin1()); } if(spawn->otherData & 8) { - name=netStream.readText(); - strcpy(spawn->suffix,name.latin1()); + name = netStream.readText(); + strcpy(spawn->suffix, name.latin1()); } - netStream.skipBytes(33); + // unknowns + netStream.skipBytes(8); + spawn->isMercenary = netStream.readUInt8(); + + // unknowns + netStream.skipBytes(24); + // now we're at the end - retVal=netStream.pos()-netStream.data(); + retVal = netStream.pos() - netStream.data(); - if(checkLen && (int32_t)len!=retVal) + if(checkLen && (int32_t)len != retVal) { - seqDebug("SpawnShell::fillSpawnStruct - expected length: %d, read: %d",len,retVal); + seqDebug("SpawnShell::fillSpawnStruct - expected length: %d, read: %d", len, retVal); } return retVal; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-05-26 02:22:21
|
Revision: 730 http://seq.svn.sourceforge.net/seq/?rev=730&view=rev Author: ieatacid Date: 2009-05-26 01:32:46 +0000 (Tue, 26 May 2009) Log Message: ----------- Tag for release 5.13.4.1 Added Paths: ----------- showeq/tags/v5_13_4_1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-05-26 02:22:20
|
Revision: 729 http://seq.svn.sourceforge.net/seq/?rev=729&view=rev Author: ieatacid Date: 2009-05-26 01:32:18 +0000 (Tue, 26 May 2009) Log Message: ----------- Fixed guild name bug Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/configure.in showeq/trunk/src/guild.cpp showeq/trunk/src/guild.h Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-05-20 22:06:24 UTC (rev 728) +++ showeq/trunk/ChangeLog 2009-05-26 01:32:18 UTC (rev 729) @@ -1,3 +1,7 @@ +ieatacid (5/25/09) +----------------- +- Fixed guild name bug + ieatacid (5/20/09) ----------------- - Updated version to 5.13.4 Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-05-20 22:06:24 UTC (rev 728) +++ showeq/trunk/configure.in 2009-05-26 01:32:18 UTC (rev 729) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.4.0) +AC_INIT(showeq, 5.13.4.1) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/guild.cpp =================================================================== --- showeq/trunk/src/guild.cpp 2009-05-20 22:06:24 UTC (rev 728) +++ showeq/trunk/src/guild.cpp 2009-05-26 01:32:18 UTC (rev 729) @@ -69,6 +69,7 @@ NetStream netStream(data,len); QString guildName; uint32_t size = 0; // to keep track of how much we're reading from the packet + uint32_t guildId = 0; /* 0x48 in the packet starts the serialized list. See guildListStruct @@ -81,29 +82,33 @@ while(!netStream.end()) { - char szGuildName[64] = {0}; - - // skip guild ID - netStream.skipBytes(4); + guildId = netStream.readUInt32NC(); guildName = netStream.readText(); size += 4; // four bytes for the guild ID if(guildName.length()) { - strcpy(szGuildName, guildName.latin1()); + m_guildList[guildId] = guildName; -// seqDebug("GuildMgr::writeGuildList - add guild '%s'", szGuildName); - guildDataStream.writeRawBytes(szGuildName, sizeof(szGuildName)); - // add guild name length, plus one for the null character size += guildName.length() + 1; } - // there's an extra zero at the end of the packet if(size + 1 == len) break; // the end } + std::map<uint32_t, QString>::iterator it; + + for(it = m_guildList.begin(); it != m_guildList.end(); it++) + { + char szGuildName[64] = {0}; + + strcpy(szGuildName, it->second.latin1()); + //seqDebug("GuildMgr::writeGuildList - add guild '%s' (%d)", szGuildName, it->first); + guildDataStream.writeRawBytes(szGuildName, sizeof(szGuildName)); + } + guildsfile.close(); seqInfo("GuildMgr: New guildsfile written"); } @@ -120,7 +125,7 @@ char szGuildName[64] = {0}; guildsfile.readBlock(szGuildName, sizeof(szGuildName)); -// seqDebug("GuildMgr::readGuildList - read guild '%s'", szGuildName); + //seqDebug("GuildMgr::readGuildList - read guild '%s'", szGuildName); m_guildMap.push_back(QString::fromUtf8(szGuildName)); } Modified: showeq/trunk/src/guild.h =================================================================== --- showeq/trunk/src/guild.h 2009-05-20 22:06:24 UTC (rev 728) +++ showeq/trunk/src/guild.h 2009-05-26 01:32:18 UTC (rev 729) @@ -43,6 +43,7 @@ private: std::vector<QString> m_guildMap; + std::map<uint32_t, QString> m_guildList; void writeGuildList(const uint8_t*, size_t); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-05-20 22:06:27
|
Revision: 728 http://seq.svn.sourceforge.net/seq/?rev=728&view=rev Author: ieatacid Date: 2009-05-20 22:06:24 +0000 (Wed, 20 May 2009) Log Message: ----------- Tag for release 5.13.4.0 Added Paths: ----------- showeq/tags/v5_13_4_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <iea...@us...> - 2009-05-20 22:03:40
|
Revision: 727 http://seq.svn.sourceforge.net/seq/?rev=727&view=rev Author: ieatacid Date: 2009-05-20 22:03:33 +0000 (Wed, 20 May 2009) Log Message: ----------- Updated opcodes + Updated code to handle serialized guild list Modified Paths: -------------- showeq/trunk/ChangeLog showeq/trunk/conf/worldopcodes.xml showeq/trunk/conf/zoneopcodes.xml showeq/trunk/configure.in showeq/trunk/src/everquest.h showeq/trunk/src/guild.cpp showeq/trunk/src/guild.h showeq/trunk/src/interface.cpp showeq/trunk/src/messageshell.cpp Modified: showeq/trunk/ChangeLog =================================================================== --- showeq/trunk/ChangeLog 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/ChangeLog 2009-05-20 22:03:33 UTC (rev 727) @@ -1,3 +1,9 @@ +ieatacid (5/20/09) +----------------- +- Updated version to 5.13.4 +- Updated opcodes +- Updated code to handle the now serialized guild list + ieatacid (3/20/09) ----------------- - Updated version to 5.13.3 Modified: showeq/trunk/conf/worldopcodes.xml =================================================================== --- showeq/trunk/conf/worldopcodes.xml 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/conf/worldopcodes.xml 2009-05-20 22:03:33 UTC (rev 727) @@ -13,7 +13,7 @@ <opcode id="5B0B" name="OP_GuildList" updated="01/17/08"> <comment>old GuildListCode</comment> - <payload dir="server" typename="worldGuildListStruct" sizechecktype="match"/> + <payload dir="server" typename="worldGuildListStruct" sizechecktype="none"/> </opcode> <opcode id="192E" name="OP_MOTD" updated="01/17/08"> <comment>old MOTDCode Server message of the day</comment> Modified: showeq/trunk/conf/zoneopcodes.xml =================================================================== --- showeq/trunk/conf/zoneopcodes.xml 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/conf/zoneopcodes.xml 2009-05-20 22:03:33 UTC (rev 727) @@ -5,63 +5,137 @@ <!-- Critical opcodes used directly by ShowEQ --> - <opcode id="7866" name="OP_NpcMoveUpdate" updated="03/197866/09"> + <opcode id="2D95" name="OP_NpcMoveUpdate" updated="05/14/09"> <comment>Position updates</comment> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="10C9" name="OP_DeleteSpawn" updated="03/19/09"> + <opcode id="7AE3" name="OP_DeleteSpawn" updated="05/14/09"> <comment>old DeleteSpawnCode</comment> <payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/> </opcode> - <opcode id="7530" name="OP_RespawnFromHover" updated="03/19/09"> + <opcode id="6130" name="OP_RespawnFromHover" updated="05/14/09"> <comment>Server telling client that it is coming back from hover death</comment> <payload dir="both" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="14D3" name="OP_Shroud" updated="03/19/09"> + <opcode id="1052" name="OP_Shroud" updated="05/14/09"> <comment>Server putting players into shroud form</comment> <payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/> </opcode> - <opcode id="63F8" name="OP_GroupFollow" updated="03/19/09"> + <opcode id="2D08" name="OP_GroupFollow" updated="05/14/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>You join a group</comment> </opcode> - <opcode id="4481" name="OP_GroupFollow2" updated="03/19/09"> + <opcode id="08C3" name="OP_GroupFollow2" updated="05/14/09"> <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/> <comment>Player joins your group</comment> </opcode> - <opcode id="1C50" name="OP_GroupUpdate" updated="03/19/09"> + <opcode id="C56C" name="OP_GroupUpdate" updated="05/14/09"> <payload dir="server" typename="uint8_t" sizechecktype="none"/> <comment>Variable length packet with group member names</comment> </opcode> - <opcode id="6B67" name="OP_GroupDisband" updated="03/19/09"> + <opcode id="49F6" name="OP_GroupDisband" updated="05/14/09"> <comment>You disband from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="6193" name="OP_GroupDisband2" updated="03/19/09"> + <opcode id="21BE" name="OP_GroupDisband2" updated="05/14/09"> <comment>Other disbands from group</comment> <payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/> </opcode> - <opcode id="4315" name="OP_GroupLeader" updated="03/19/09"> + <opcode id="58E6" name="OP_GroupLeader" updated="05/14/09"> <comment>Group leader change</comment> <payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="565D" name="OP_DzSwitchInfo" updated="03/19/09"> + <opcode id="4B1E" name="OP_DzSwitchInfo" updated="05/14/09"> <comment></comment> <payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/> </opcode> - <opcode id="3657" name="OP_DzInfo" updated="02/11/09"> + <opcode id="054E" name="OP_DzInfo" updated="05/14/09"> <comment></comment> <payload dir="server" typename="dzInfo" sizechecktype="match"/> </opcode> - <opcode id="6022" name="OP_PlayerProfile" updated="01/17/08"> - <comment>old CharProfileCode</comment> - <payload dir="server" typename="charProfileStruct" sizechecktype="match"/> + <opcode id="783C" name="OP_FormattedMessage" updated="05/14/09"> + <comment>old FormattedMessageCode</comment> + <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="5A6B" name="OP_ZoneEntry" updated="10/07/08"> + <opcode id="4D27" name="OP_ZoneEntry" updated="05/14/09"> <comment>old ZoneEntryCode</comment> <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> + <opcode id="4E19" name="OP_SpawnDoor" updated="05/14/09"> + <comment>old DoorSpawnsCode</comment> + <payload dir="server" typename="doorStruct" sizechecktype="modulus"/> + </opcode> + <opcode id="4892" name="OP_SendZonePoints" updated="05/14/09"> + <comment>Coords in a zone that will port you to another zone</comment> + <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> + </opcode> + <opcode id="053A" name="OP_AAExpUpdate" updated="05/14/09"> + <comment>Receiving AA experience. Also when percent to AA changes.</comment> + <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> + </opcode> <opcode id="053A" name="OP_AAExpUpdate" updated="05/14/09"> + <comment>Receiving AA experience. Also when percent to AA changes.</comment> + <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> + </opcode> + <opcode id="0B80" name="OP_GuildMOTD" updated="05/14/09"> + <comment>GuildMOTD</comment> + <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> + </opcode> + <opcode id="592D" name="OP_HPUpdate" updated="05/14/09"> + <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment> + <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/> + </opcode> + <opcode id="1190" name="OP_GuildMemberUpdate" updated="05/14/09"> + <comment></comment> + <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/> + </opcode> + <opcode id="38D1" name="OP_SpawnRename" updated="05/14/09"> + <comment>Spawns getting renamed after initial NewSpawn</comment> + <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/> + </opcode> + <opcode id="6893" name="OP_GroupInvite" updated="05/14/09"> + <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> + <payload dir="server" typename="groupAltInviteStruct" sizechecktype="match"/> + <comment>You're inviting someone and you're not grouped</comment> + </opcode> + <opcode id="224F" name="OP_SwapSpell" updated="05/14/09"> + <comment>old TradeSpellBookSlotsCode</comment> + <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/> + </opcode> + <opcode id="6087" name="OP_InspectAnswer" updated="05/14/09"> + <comment>old InspectDataCode</comment> + <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> + </opcode> + <opcode id="1318" name="OP_SimpleMessage" updated="05/14/09"> + <comment>old SimpleMessageCode</comment> + <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/> + </opcode> + <opcode id="7B77" name="OP_SpecialMesg" updated="05/14/09"> + <comment>Communicate textual info to client</comment> + <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/> + </opcode> + <opcode id="73D6" name="OP_RandomReq" updated="05/14/09"> + <comment>old RandomReqCode</comment> + <payload dir="client" typename="randomReqStruct" sizechecktype="match"/> + </opcode> + <opcode id="0C2D" name="OP_ConsentResponse" updated="05/14/09"> + <comment>Server replying with consent information after /consent</comment> + <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> + </opcode> + <opcode id="3675" name="OP_DenyResponse" updated="05/14/09"> + <comment>Server replying with deny information after /deny</comment> + <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> + </opcode> + <opcode id="7092" name="OP_BazaarSearch" updated="05/14/09"> + <payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/> + <payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/> + <payload dir="server" typename="uint8_t" sizechecktype="none"/> + <comment>Bazaar search tool</comment> + </opcode> + <opcode id="6022" name="OP_PlayerProfile" updated="01/17/08"> + <comment>old CharProfileCode</comment> + <payload dir="server" typename="charProfileStruct" sizechecktype="match"/> + </opcode> <opcode id="6015" name="OP_TimeOfDay" updated="01/17/08"> <comment>old TimeOfDayCode</comment> <payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/> @@ -70,23 +144,11 @@ <comment>old NewZoneCode</comment> <payload dir="server" typename="newZoneStruct" sizechecktype="match"/> </opcode> - <opcode id="102F" name="OP_SpawnDoor" updated="10/21/08"> - <comment>old DoorSpawnsCode</comment> - <payload dir="server" typename="doorStruct" sizechecktype="modulus"/> - </opcode> <opcode id="33E5" name="OP_GroundSpawn" updated="01/17/08"> <comment>old MakeDropCode</comment> <payload dir="server" typename="makeDropStruct" sizechecktype="match"/> <payload dir="client" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="5821" name="OP_SendZonePoints" updated="10/21/08"> - <comment>Coords in a zone that will port you to another zone</comment> - <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/> - </opcode> - <opcode id="3088" name="OP_AAExpUpdate" updated="01/17/08"> - <comment>Receiving AA experience. Also when percent to AA changes.</comment> - <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/> - </opcode> <opcode id="0E98" name="OP_ExpUpdate" updated="01/17/08"> <comment>old ExpUpdateCode</comment> <payload dir="server" typename="expUpdateStruct" sizechecktype="match"/> @@ -95,10 +157,6 @@ <comment></comment> <payload dir="server" typename="uint8_t" sizechecktype="none"/> </opcode> - <opcode id="D677" name="OP_GuildMOTD" updated="01/17/08"> - <comment>GuildMOTD</comment> - <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/> - </opcode> <opcode id="7062" name="OP_ClientUpdate" updated="01/17/08"> <comment>Position updates</comment> <payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/> @@ -128,14 +186,6 @@ <comment>Server updating on hunger/thirst</comment> <payload dir="server" typename="staminaStruct" sizechecktype="match"/> </opcode> - <opcode id="538F" name="OP_HPUpdate" updated="10/21/08"> - <comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment> - <payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/> - </opcode> - <opcode id="41C0" name="OP_GuildMemberUpdate" updated="10/21/08"> - <comment></comment> - <payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/> - </opcode> <opcode id="5F0D" name="OP_ClickObject" updated="01/17/08"> <comment>old RemDropCode</comment> <payload dir="both" typename="remDropStruct" sizechecktype="match"/> @@ -157,10 +207,6 @@ <comment>Targeting a person - old ClientTargetCode</comment> <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/> </opcode> - <opcode id="0A1D" name="OP_SpawnRename" updated="01/17/08"> - <comment>Spawns getting renamed after initial NewSpawn</comment> - <payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/> - </opcode> <opcode id="48F9" name="OP_Illusion" updated="01/17/08"> <comment>Spawn being illusioned (changing forms)</comment> <payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/> @@ -169,11 +215,6 @@ <comment>old ZoneChangeCode</comment> <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/> </opcode> - <opcode id="5D32" name="OP_GroupInvite" updated="10/07/08"> - <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> - <payload dir="server" typename="groupAltInviteStruct" sizechecktype="match"/> - <comment>You're inviting someone and you're not grouped</comment> - </opcode> <opcode id="548c" name="OP_GroupInvite2" updated="09/03/08"> <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/> <comment>You're inviting someone and you are grouped</comment> @@ -198,65 +239,27 @@ <comment>old StartCastCode</comment> <payload dir="both" typename="startCastStruct" sizechecktype="match"/> </opcode> - <opcode id="3FD2" name="OP_SwapSpell" updated="01/17/08"> - <comment>old TradeSpellBookSlotsCode</comment> - <payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/> - </opcode> <opcode id="8543" name="OP_MemorizeSpell" updated="01/17/08"> <comment>old MemSpellCode</comment> <payload dir="both" typename="memSpellStruct" sizechecktype="match"/> </opcode> - <opcode id="4938" name="OP_InspectAnswer" updated="10/07/08"> - <comment>old InspectDataCode</comment> - <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/> - </opcode> <opcode id="7434" name="OP_Emote" updated="01/17/08"> <comment>old EmoteTextCode</comment> <payload dir="both" typename="emoteTextStruct" sizechecktype="none"/> </opcode> - <opcode id="5448" name="OP_SimpleMessage" updated="01/17/08"> - <comment>old SimpleMessageCode</comment> - <payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/> - </opcode> - <opcode id="1318" name="OP_FormattedMessage" updated="01/17/08"> - <comment>old FormattedMessageCode</comment> - <payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/> - </opcode> <opcode id="2E79" name="OP_CommonMessage" updated="01/17/08"> <comment>old ChannelMessageCode</comment> <payload dir="both" typename="channelMessageStruct" sizechecktype="none"/> </opcode> - <opcode id="074F" name="OP_SpecialMesg" updated="01/17/08"> - <comment>Communicate textual info to client</comment> - <payload dir="server" typename="specialMessageStruct" sizechecktype="none"/> - </opcode> - <opcode id="777C" name="OP_RandomReq" updated="01/17/08"> - <comment>old RandomReqCode</comment> - <payload dir="client" typename="randomReqStruct" sizechecktype="match"/> - </opcode> <opcode id="6CDC" name="OP_RandomReply" updated="01/17/08"> <comment>old RandomCode</comment> <payload dir="server" typename="randomStruct" sizechecktype="match"/> </opcode> - <opcode id="6E47" name="OP_ConsentResponse" updated="10/21/08"> - <comment>Server replying with consent information after /consent</comment> - <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> - </opcode> - <opcode id="7CE7" name="OP_DenyResponse" updated="10/21/08"> - <comment>Server replying with deny information after /deny</comment> - <payload dir="server" typename="consentResponseStruct" sizechecktype="match"/> - </opcode> <opcode id="50C2" name="OP_ManaChange" updated="01/17/08"> <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"/> </opcode> - <opcode id="4675" name="OP_BazaarSearch" updated="01/17/08"> - <payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/> - <payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/> - <payload dir="server" typename="uint8_t" sizechecktype="none"/> - <comment>Bazaar search tool</comment> - </opcode> <opcode id="6546" name="OP_MoneyOnCorpse" updated="01/17/08"> <comment>old MoneyOnCorpseCode</comment> <payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/> Modified: showeq/trunk/configure.in =================================================================== --- showeq/trunk/configure.in 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/configure.in 2009-05-20 22:03:33 UTC (rev 727) @@ -2,7 +2,7 @@ dnl $Id$ $Name$ AC_PREREQ(2.59) -AC_INIT(showeq, 5.13.3.0) +AC_INIT(showeq, 5.13.4.0) AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM Modified: showeq/trunk/src/everquest.h =================================================================== --- showeq/trunk/src/everquest.h 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/src/everquest.h 2009-05-20 22:03:33 UTC (rev 727) @@ -1989,8 +1989,9 @@ /*0004*/ uint32_t spellId; // Spell ID /*0008*/ int32_t inventorySlot; // ***Placeholder /*0012*/ uint32_t targetId; // The current selected target -/*0016*/ uint8_t unknown0018[4]; // ***Placeholder -/*0020*/ +/*0016*/ uint8_t unknown0018[4]; // ***Placeholder +/*0020*/ uint8_t unknown0020[16]; // ***Placeholder (4/7/2009) +/*0036*/ }; /* @@ -2554,23 +2555,25 @@ /* ** Guild List (from world server) -** Length: 96 Octets +** Length: 68 Octets ** used in: worldGuildList */ struct guildListStruct { -/*0000*/ char guildName[64]; +/*0000*/ uint32_t guildId; +/*0004*/ char guildName[64]; }; /* ** Guild List (from world server) -** Length: 96064 Octets +** Length: Variable (serialized) */ struct worldGuildListStruct { -/*000*/ guildListStruct dummy; -/*064*/ guildListStruct guilds[MAX_GUILDS]; +/*000*/ uint8_t unknown000[64]; +/*064*/ uint32_t numberOfGuilds; // ? +/*068*/ guildListStruct guilds[MAX_GUILDS]; // MAX_GUILDS varies by server now }; struct worldMOTDStruct Modified: showeq/trunk/src/guild.cpp =================================================================== --- showeq/trunk/src/guild.cpp 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/src/guild.cpp 2009-05-20 22:03:33 UTC (rev 727) @@ -17,6 +17,7 @@ #include "guild.h" #include "packet.h" #include "diagnosticmessages.h" +#include "netstream.h" #include <qfile.h> #include <qdatastream.h> @@ -43,20 +44,17 @@ void GuildMgr::worldGuildList(const uint8_t* data, size_t len) { - const worldGuildListStruct* gls = (const worldGuildListStruct*)data; - - writeGuildList(gls, len); + writeGuildList(data, len); readGuildList(); } -void GuildMgr::writeGuildList(const worldGuildListStruct* gls, size_t len) +void GuildMgr::writeGuildList(const uint8_t* data, size_t len) { QFile guildsfile(guildsFileName); if (guildsfile.exists()) { if (!guildsfile.remove()) { - seqWarn("GuildMgr: Could not remove old %s, unable to replace with server data!" -, + seqWarn("GuildMgr: Could not remove old %s, unable to replace with server data!", guildsFileName.latin1()); return; } @@ -68,8 +66,44 @@ QDataStream guildDataStream(&guildsfile); - guildDataStream.writeRawBytes((char *)gls->guilds, sizeof(gls->guilds)); + NetStream netStream(data,len); + QString guildName; + uint32_t size = 0; // to keep track of how much we're reading from the packet + /* + 0x48 in the packet starts the serialized list. See guildListStruct + and worldGuildListStruct in everquest.h + */ + + // skip to the first guild in the list + netStream.skipBytes(0x44); + size += 0x44; + + while(!netStream.end()) + { + char szGuildName[64] = {0}; + + // skip guild ID + netStream.skipBytes(4); + guildName = netStream.readText(); + size += 4; // four bytes for the guild ID + + if(guildName.length()) + { + strcpy(szGuildName, guildName.latin1()); + +// seqDebug("GuildMgr::writeGuildList - add guild '%s'", szGuildName); + guildDataStream.writeRawBytes(szGuildName, sizeof(szGuildName)); + + // add guild name length, plus one for the null character + size += guildName.length() + 1; + } + + // there's an extra zero at the end of the packet + if(size + 1 == len) + break; // the end + } + guildsfile.close(); seqInfo("GuildMgr: New guildsfile written"); } @@ -81,25 +115,15 @@ m_guildMap.clear(); if (guildsfile.open(IO_ReadOnly)) { - worldGuildListStruct tmp; - if (guildsfile.size() != sizeof(tmp.guilds)) + while (!guildsfile.atEnd()) { - seqWarn("GuildMgr: Guildsfile not loaded, expected size %d got %ld", - sizeof(worldGuildListStruct), guildsfile.size()); - return; + char szGuildName[64] = {0}; + + guildsfile.readBlock(szGuildName, sizeof(szGuildName)); +// seqDebug("GuildMgr::readGuildList - read guild '%s'", szGuildName); + m_guildMap.push_back(QString::fromUtf8(szGuildName)); } - struct guildListStruct gl; - - while (!guildsfile.atEnd()) - { - guildsfile.readBlock(reinterpret_cast<char*>(&gl), sizeof(gl)); - // Commented out until verified that this needs to actually be - // removed. -- Ratt - // if (strlen(gl.guildName) > 0) - m_guildMap.push_back(QString::fromUtf8(gl.guildName)); - } - guildsfile.close(); seqInfo("GuildMgr: Guildsfile loaded"); } Modified: showeq/trunk/src/guild.h =================================================================== --- showeq/trunk/src/guild.h 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/src/guild.h 2009-05-20 22:03:33 UTC (rev 727) @@ -44,7 +44,7 @@ private: std::vector<QString> m_guildMap; - void writeGuildList(const worldGuildListStruct*, size_t); + void writeGuildList(const uint8_t*, size_t); QString guildsFileName; Modified: showeq/trunk/src/interface.cpp =================================================================== --- showeq/trunk/src/interface.cpp 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/src/interface.cpp 2009-05-20 22:03:33 UTC (rev 727) @@ -1718,7 +1718,7 @@ if (m_guildmgr) { m_packet->connect2("OP_GuildList", SP_World, DIR_Server, - "worldGuildListStruct", SZC_Match, + "worldGuildListStruct", SZC_None, m_guildmgr, SLOT(worldGuildList(const uint8_t*, size_t))); Modified: showeq/trunk/src/messageshell.cpp =================================================================== --- showeq/trunk/src/messageshell.cpp 2009-03-21 00:05:33 UTC (rev 726) +++ showeq/trunk/src/messageshell.cpp 2009-05-20 22:03:33 UTC (rev 727) @@ -768,14 +768,20 @@ // m_messages->addMessage(MT_Player, message); int buffnumber; + QString spellName; + for (buffnumber=0;buffnumber<MAX_BUFFS;buffnumber++) { if (player->profile.buffs[buffnumber].spellid && player->profile.buffs[buffnumber].duration) { - message.sprintf("You have buff %s duration left is %d in ticks.", - (const char*)spell_name(player->profile.buffs[buffnumber].spellid), - player->profile.buffs[buffnumber].duration); + const Spell* spell = m_spells->spell(player->profile.buffs[buffnumber].spellid); + if(spell) + spellName = spell->name(); + else + spellName = spell_name(player->profile.buffs[buffnumber].spellid); + message.sprintf("You have buff %s duration left is %d in ticks.", spellName.latin1(), + player->profile.buffs[buffnumber].duration); m_messages->addMessage(MT_Player, message); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |