|
From: <the...@us...> - 2020-03-15 16:25:40
|
Revision: 1016
http://sourceforge.net/p/seq/svn/1016
Author: theblueadept
Date: 2020-03-15 16:25:39 +0000 (Sun, 15 Mar 2020)
Log Message:
-----------
Historical checkin for 03/15/20
- Updated Opcodes (Newby and cn187)
- Updated Structs (Newby)
Version to 5.13.10.94
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/everquest.h
showeq/trunk/src/filter.cpp
showeq/trunk/src/spawnshell.cpp
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2020-03-12 19:45:33 UTC (rev 1015)
+++ showeq/trunk/ChangeLog 2020-03-15 16:25:39 UTC (rev 1016)
@@ -1,3 +1,10 @@
+BlueAdept (03/15/20)
+-------------------
+- Updated version to 5.13.10.94
+- Support EQ patch 03/11/20
+- Updated Opcodes (Newby and cn187)
+- Updated Structs (Newby)
+
BlueAdept (02/15/20)
-------------------
- Updated version to 5.13.10.93
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2020-03-12 19:45:33 UTC (rev 1015)
+++ showeq/trunk/conf/zoneopcodes.xml 2020-03-15 16:25:39 UTC (rev 1016)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="3f90" name="OP_PlayerProfile" updated="02/14/20">
+ <opcode id="0f0b" name="OP_PlayerProfile" updated="03/11/20">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="08ec" name="OP_ZoneEntry" updated="02/14/20">
+ <opcode id="19da" name="OP_ZoneEntry" updated="03/11/20">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="01fe" name="OP_TimeOfDay" updated="02/14/20">
+ <opcode id="64d8" name="OP_TimeOfDay" updated="03/11/20">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="714f" name="OP_NewZone" updated="02/14/20">
+ <opcode id="2755" name="OP_NewZone" updated="03/11/20">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2d2c" name="OP_SpawnDoor" updated="02/14/20">
+ <opcode id="2bb4" name="OP_SpawnDoor" updated="03/11/20">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="6158" name="OP_GroundSpawn" updated="02/14/20">
+ <opcode id="3f2b" name="OP_GroundSpawn" updated="03/11/20">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="64fa" name="OP_SendZonePoints" updated="02/14/20">
+ <opcode id="55ed" name="OP_SendZonePoints" updated="03/11/20">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4a11" name="OP_AAExpUpdate" updated="02/14/20">
+ <opcode id="75f8" name="OP_AAExpUpdate" updated="03/11/20">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7811" name="OP_ExpUpdate" updated="02/14/20">
+ <opcode id="2cda" name="OP_ExpUpdate" updated="03/11/20">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="02a8" name="OP_GuildMOTD" updated="02/14/20">
+ <opcode id="0262" name="OP_GuildMOTD" updated="03/11/20">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="04e6" name="OP_ClientUpdate" updated="02/14/20">
+ <opcode id="5d37" name="OP_ClientUpdate" updated="03/11/20">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="56b9" name="OP_NpcMoveUpdate" updated="02/14/20">
+ <opcode id="5c18" name="OP_NpcMoveUpdate" updated="03/11/20">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="7e8b" name="OP_MobUpdate" updated="02/14/20">
+ <opcode id="5a67" name="OP_MobUpdate" updated="03/11/20">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="2326" name="OP_DeleteSpawn" updated="02/14/20">
+ <opcode id="0835" name="OP_DeleteSpawn" updated="03/11/20">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6dd5" name="OP_RemoveSpawn" updated="02/14/20">
+ <opcode id="0292" name="OP_RemoveSpawn" updated="03/11/20">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="7d3c" name="OP_Death" updated="02/14/20">
+ <opcode id="633e" name="OP_Death" updated="03/11/20">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0380" name="OP_WearChange" updated="02/14/20">
+ <opcode id="4381" name="OP_WearChange" updated="03/11/20">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5226" name="OP_SpawnAppearance" updated="02/14/20">
+ <opcode id="1332" name="OP_SpawnAppearance" updated="03/11/20">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -82,36 +82,36 @@
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2fcd" name="OP_HPUpdate" updated="02/14/20">
+ <opcode id="5755" name="OP_HPUpdate" updated="03/11/20">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="49ec" name="OP_GuildMemberUpdate" updated="02/14/20">
+ <opcode id="0bf8" name="OP_GuildMemberUpdate" updated="03/11/20">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="7864" name="OP_ClickObject" updated="02/14/20">
+ <opcode id="21ba" name="OP_ClickObject" updated="03/11/20">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1d1a" name="OP_Action" updated="02/14/20">
+ <opcode id="54d3" name="OP_Action" updated="03/11/20">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1f98" name="OP_Action2" updated="02/14/20">
+ <opcode id="5c13" name="OP_Action2" updated="03/11/20">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="0cb1" name="OP_Consider" updated="02/14/20">
+ <opcode id="5288" name="OP_Consider" updated="03/11/20">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1bc7" name="OP_TargetMouse" updated="02/14/20">
+ <opcode id="4962" name="OP_TargetMouse" updated="03/11/20">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="661e" name="OP_SpawnRename" updated="02/14/20">
+ <opcode id="0523" name="OP_SpawnRename" updated="03/11/20">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="1bed" name="OP_ZoneChange" updated="02/14/20">
+ <opcode id="6639" name="OP_ZoneChange" updated="03/11/20">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -175,11 +175,11 @@
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5a2d" name="OP_SwapSpell" updated="02/14/20">
+ <opcode id="6102" name="OP_SwapSpell" updated="03/11/20">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6cb6" name="OP_MemorizeSpell" updated="02/14/20">
+ <opcode id="6dd3" name="OP_MemorizeSpell" updated="03/11/20">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="206f" name="OP_SimpleMessage" updated="02/14/20">
+ <opcode id="5435" name="OP_SimpleMessage" updated="03/11/20">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7fb3" name="OP_FormattedMessage" updated="02/14/20">
+ <opcode id="524d" name="OP_FormattedMessage" updated="03/11/20">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4d93" name="OP_CommonMessage" updated="02/14/20">
+ <opcode id="6377" name="OP_CommonMessage" updated="03/11/20">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="074a" name="OP_SpecialMesg" updated="02/14/20">
+ <opcode id="48bd" name="OP_SpecialMesg" updated="03/11/20">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -223,7 +223,7 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6673" name="OP_ManaChange" updated="02/14/20">
+ <opcode id="6b2b" name="OP_ManaChange" updated="03/11/20">
<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"/>
@@ -240,11 +240,11 @@
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1e3c" name="OP_SkillUpdate" updated="02/14/20">
+ <opcode id="093b" name="OP_SkillUpdate" updated="03/11/20">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="558c" name="OP_LevelUpdate" updated="02/14/20">
+ <opcode id="463f" name="OP_LevelUpdate" updated="03/11/20">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="04a2" name="OP_GuildMemberList" updated="02/14/20">
+ <opcode id="3fbe" name="OP_GuildMemberList" updated="03/11/20">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1eac" name="OP_ManaUpdate" updated="02/14/20">
+ <opcode id="01d7" name="OP_ManaUpdate" updated="03/11/20">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="00b5" name="OP_EndUpdate" updated="02/14/20">
+ <opcode id="7379" name="OP_EndUpdate" updated="03/11/20">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="0082" name="OP_ExpandedGuildInfo" updated="02/14/20">
+ <opcode id="28cd" name="OP_ExpandedGuildInfo" updated="03/11/20">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="7562" name="OP_Find" updated="02/14/20">
+ <opcode id="309e" name="OP_Find" updated="03/11/20">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2020-03-12 19:45:33 UTC (rev 1015)
+++ showeq/trunk/configure.in 2020-03-15 16:25:39 UTC (rev 1016)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.10.93)
+AC_INIT(showeq, 5.13.10.94)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h 2020-03-12 19:45:33 UTC (rev 1015)
+++ showeq/trunk/src/everquest.h 2020-03-15 16:25:39 UTC (rev 1016)
@@ -1096,26 +1096,30 @@
struct
{
- signed deltaHeading:10; // change in heading
- signed animation:10; // velocity
+ signed y:19; // y coord (2nd loc value)
+ unsigned padding00:13;
+
+ signed z:19; // z coord (3rd loc value)
unsigned pitch:12;
+ unsigned padding01:1;
- signed deltaY:13; // change in y
- signed deltaX:13; // change in x
- unsigned padding01:6;
-
- signed z:19; // z coord (3rd loc value)
signed deltaZ:13; // change in z
+ signed deltaHeading:10; // change in heading
+ unsigned padding02:9;
unsigned heading:12; // heading
- signed y:19; // y coord (2nd loc value)
- unsigned padding03:1;
+ signed animation:10; // velocity
+ unsigned padding03:10;
+ signed deltaX:13; // change in x
+ signed deltaY:13; // change in y
+ unsigned padding04:6;
+
signed x:19; // x coord (1st loc value)
- unsigned padding04:13;
+ unsigned padding05:13;
};
- int32_t posData[5];
+ int32_t posData[6];
};
/*0000*/ union
{
@@ -2366,7 +2370,7 @@
/*
** Player Position Update
-** Length: 24 Octets
+** Length: 28 Octets
** OpCode: PlayerPosCode
*/
@@ -2375,29 +2379,33 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed deltaHeading:10; // change in heading
- signed animation:10; // velocity
+ signed y:19; // y coord (2nd loc value)
+ unsigned padding00:13;
+/*0008*/
+ signed z:19; // z coord (3rd loc value)
unsigned pitch:12;
-/*0008*/
- signed deltaY:13; // change in y
- signed deltaX:13; // change in x
- unsigned padding01:6;
+ unsigned padding01:1;
/*0012*/
- signed z:19; // z coord (3rd loc value)
signed deltaZ:13; // change in z
+ signed deltaHeading:10; // change in heading
+ unsigned padding02:9;
/*0016*/
unsigned heading:12; // heading
- signed y:19; // y coord (2nd loc value)
- unsigned padding03:1;
+ signed animation:10; // velocity
+ unsigned padding03:10;
/*0020*/
+ signed deltaX:13; // change in x
+ signed deltaY:13; // change in y
+ unsigned padding04:6;
+/*0024*/
signed x:19; // x coord (1st loc value)
- unsigned padding04:13;
-/*0024*/
+ unsigned padding05:13;
+/*0028*/
};
/*
** Self Position Update
-** Length: 38 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
@@ -2407,26 +2415,28 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- float deltaY; // Change in y
+ float deltaX; // Change in x
/*0010*/
- float y; // y coord (2nd loc value)
+ signed animation:10; // velocity
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding01:10;
/*0014*/
- unsigned pitch:12; // pitch (up/down heading)
- signed deltaHeading:10; // change in heading
- unsigned padding02:10;
+ unsigned heading:12; // Heading
+ unsigned padding02:20;
/*0018*/
- float x; // x coord (1st loc value)
+ float deltaY; // Change in y
/*0022*/
- signed animation:10; // velocity
- unsigned heading:12; // Heading
- unsigned padding04:10;
+ float z; // z coord (3rd loc value)
/*0026*/
- float z; // z coord (3rd loc value)
+ float y; // y coord (2nd loc value)
/*0030*/
- float deltaX; // Change in x
+ float x; // x coord (1st loc value)
/*0034*/
+ signed deltaHeading:10; // change in heading
+ unsigned padding07:22;
+/*0038*/
float deltaZ; // Change in z
-/*0038*/
+/*0042*/
};
/*
Modified: showeq/trunk/src/filter.cpp
===================================================================
--- showeq/trunk/src/filter.cpp 2020-03-12 19:45:33 UTC (rev 1015)
+++ showeq/trunk/src/filter.cpp 2020-03-15 16:25:39 UTC (rev 1016)
@@ -444,13 +444,11 @@
{
// get the Filter object
filter = it->second;
-
- // erase the member from the list
- m_filters.erase(it);
// delete the filter
delete filter;
}
+ m_filters.clear ();
return true;
}
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2020-03-12 19:45:33 UTC (rev 1015)
+++ showeq/trunk/src/spawnshell.cpp 2020-03-15 16:25:39 UTC (rev 1016)
@@ -721,6 +721,7 @@
spawn->posData[2] = netStream.readUInt32NC();
spawn->posData[3] = netStream.readUInt32NC();
spawn->posData[4] = netStream.readUInt32NC();
+ spawn->posData[5] = netStream.readUInt32NC();
if(spawn->hasTitle)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|