ShortBuss
10-08-2013, 01:56 PM
This patch is based on latest SVN (Not based on Newby's update). Check out command again:
svn checkout http://svn.code.sf.net/p/seq/svn/showeq/trunk showeq
How to build from svn:
make -f Makefile.dist build
./configure
make
make install
Here is the diff:
Index: conf/zoneopcodes.xml
================================================== =================
--- conf/zoneopcodes.xml (revision 793)
+++ conf/zoneopcodes.xml (working copy)
@@ -3,33 +3,33 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="59ab" name="OP_PlayerProfile" updated="08/21/13">
+ <opcode id="03b5" name="OP_PlayerProfile" updated="10/08/13">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="500c" name="OP_ZoneEntry" updated="08/21/13">
+ <opcode id="078e" name="OP_ZoneEntry" updated="10/08/13">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5c79" name="OP_TimeOfDay" updated="08/21/13">
+ <opcode id="6b71" name="OP_TimeOfDay" updated="10/08/13">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1af6" name="OP_NewZone" updated="08/21/13">
+ <opcode id="0688" name="OP_NewZone" updated="10/08/13">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3f2c" name="OP_SpawnDoor" updated="08/21/13">
+ <opcode id="0d73" name="OP_SpawnDoor" updated="10/08/13">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="22ea" name="OP_GroundSpawn" updated="08/21/13">
+ <opcode id="77f4" name="OP_GroundSpawn" updated="10/08/13">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1b4d" name="OP_SendZonePoints" updated="08/21/13">
+ <opcode id="1549" name="OP_SendZonePoints" updated="10/08/13">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
@@ -41,40 +41,40 @@
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="55c1" name="OP_GuildMOTD" updated="08/21/13">
+ <opcode id="1d26" name="OP_GuildMOTD" updated="10/08/13">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="183d" name="OP_ClientUpdate" updated="08/21/13">
+ <opcode id="753d" name="OP_ClientUpdate" updated="10/08/13">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7417" name="OP_NpcMoveUpdate" updated="08/21/13">
+ <opcode id="41a9" name="OP_NpcMoveUpdate" updated="10/08/13">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="7905" name="OP_MobUpdate" updated="08/21/13">
+ <opcode id="374f" name="OP_MobUpdate" updated="10/08/13">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="5d22" name="OP_DeleteSpawn" updated="08/21/13">
+ <opcode id="21bd" name="OP_DeleteSpawn" updated="10/08/13">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2616" name="OP_RemoveSpawn" updated="08/21/13">
+ <opcode id="3d89" name="OP_RemoveSpawn" updated="10/08/13">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="0d78" name="OP_Death" updated="08/21/13">
+ <opcode id="68a0" name="OP_Death" updated="10/08/13">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="66ca" name="OP_WearChange" updated="08/21/13">
+ <opcode id="6a1b" name="OP_WearChange" updated="10/08/13">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2363" name="OP_SpawnAppearance" updated="08/21/13">
+ <opcode id="5135" name="OP_SpawnAppearance" updated="10/08/13">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -86,7 +86,7 @@
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7b11" name="OP_GuildMemberUpdate" updated="08/21/13">
+ <opcode id="2c52" name="OP_GuildMemberUpdate" updated="10/08/13">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
@@ -99,15 +99,15 @@
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4f6c" name="OP_Action2" updated="07/16/13">
+ <opcode id="349a" name="OP_Action2" updated="10/08/13">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="004f" name="OP_Consider" updated="08/21/13">
+ <opcode id="6a7f" name="OP_Consider" updated="10/08/13">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="69ad" name="OP_TargetMouse" updated="08/21/13">
+ <opcode id="0ac5" name="OP_TargetMouse" updated="10/08/13">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
Index: src/everquest.h
================================================== =================
--- src/everquest.h (revision 793)
+++ src/everquest.h (working copy)
@@ -1090,22 +1090,22 @@
{
struct
{
- unsigned pitch:12;
- signed z:19; // z coord
- unsigned padding01:1;
- signed animation:10; // velocity
- unsigned padding04:3;
- signed deltaHeading:10; // change in heading
- unsigned padding02:9;
- signed x:19; // x coord
- unsigned heading:12; // heading
- unsigned padding03:01;
- signed y:19; // y coord
- signed deltaX:13; // change in x
- signed deltaY:13; // change in y
- signed deltaZ:13; // change in z
- unsigned padding05:2;
- unsigned padding06:4;
+ unsigned pitch:12;
+ unsigned heading:12; // heading
+ unsigned padding04:1;
+ unsigned padding01:7;
+ signed z:19; // z coord
+ signed deltaZ:13; // change in z
+ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord
+ unsigned padding03:03;
+ signed x:19; // x coord
+ signed animation:10; // velocity
+ unsigned padding02:3;
+ signed deltaY:13; // change in y
+ signed deltaX:13; // change in x
+ unsigned padding05:2;
+ unsigned padding06:4;
};
int32_t posData[5];
};
@@ -2354,27 +2354,27 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/ unsigned pitch:12;
- signed z:19; // z coord
- unsigned padding01:1;
-/*0008*/ signed animation:10; // velocity
- unsigned padding04:3;
- signed deltaHeading:10; // change in heading
- unsigned padding02:9;
-/*0012*/ signed x:19; // x coord
- unsigned heading:12; // heading
- unsigned padding03:01;
-/*0016*/ signed y:19; // y coord
- signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned padding04:1;
+ unsigned padding01:7;
+/*0008*/ signed z:19; // z coord
+ signed deltaZ:13; // change in z
+/*0012*/ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord
+ unsigned padding03:03;
+/*0016*/ signed x:19; // x coord
+ signed animation:10; // velocity
+ unsigned padding02:3;
/*0020*/ signed deltaY:13; // change in y
- signed deltaZ:13; // change in z
- unsigned padding05:2;
- unsigned padding06:4;
+ signed deltaX:13; // change in x
+ unsigned padding05:2;
+ unsigned padding06:4;
/*0024*/
};
/*
** Self Position Update
-** Length: 38 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
@@ -2384,18 +2384,21 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/ unsigned pitch:12; // pitch (up/down heading)
- signed animation:10; // velocity
+ unsigned padding4:10;
unsigned padding1:10;
-/*0010*/ float deltaY; // Change in y
-/*0014*/ float y; // y coord (2nd loc value)
-/*0018*/ float deltaZ; // Change in z
-/*0022*/ float z; // z coord (3rd loc value)
-/*0026*/ float deltaX; // Change in x
-/*0030*/ float x; // x coord (1st loc value)
+/*0010*/ float z; // z coord (3rd loc value)
+/*0014*/ signed animation:10; // velocity
+ unsigned heading:12; // Directional heading
+ unsigned padding5:10;
+/*0018*/ float y; // y coord (2nd loc value)
+/*0022*/ float deltaX; // Change in x
+/*0026*/ float deltaZ; // Change in z
+/*0030*/ float deltaY; // Change in y
/*0034*/ signed deltaHeading:10; // change in heading
- unsigned heading:12; // Directional heading
- unsigned padding2:10; // ***Placeholder
-/*0038*/
+ unsigned padding3:10;
+ unsigned padding2:12; // ***Placeholder
+/*0038*/ float x; // x coord (1st loc value)
+/*0042*/
};
@@ -2693,4 +2696,4 @@
//. .7...6....,X....D4.M.\.....P.v..>..W....
//123456789012345678901234567890123456789012
-//000000000111111111122222222223333333333444
+//000000000111111111122222222223333333333444
\ No newline at end of file
Index: src/player.cpp
================================================== =================
--- src/player.cpp (revision 793)
+++ src/player.cpp (working copy)
@@ -852,27 +852,31 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/ unsigned pitch:12; // pitch (up/down heading)
- signed animation:10; // velocity
+ unsigned padding4:10;
unsigned padding1:10;
- /*0010*/ float deltaY; // Change in y
- /*0014*/ float y; // y coord (2nd loc value)
- /*0018*/ float deltaZ; // Change in z
- /*0022*/ float z; // z coord (3rd loc value)
- /*0026*/ float deltaX; // Change in x
- /*0030*/ float x; // x coord (1st loc value)
+ /*0010*/ float z; // z coord (3rd loc value)
+ /*0014*/ signed animation:10; // velocity
+ unsigned heading:12; // Directional heading
+ unsigned padding5:10;
+ /*0018*/ float y; // y coord (2nd loc value)
+ /*0022*/ float deltaX; // Change in x
+ /*0026*/ float deltaZ; // Change in z
+ /*0030*/ float deltaY; // Change in y
/*0034*/ signed deltaHeading:10; // change in heading
- unsigned heading:12; // Directional heading
- unsigned padding2:10; // ***Placeholder
- /*0038*/
+ unsigned padding3:10;
+ unsigned padding2:12; // ***Placeholder
+ /*0038*/ float x; // x coord (1st loc value)
+ /*0042*/
};
#pragma pack(0)
struct pos *p = (struct pos *)data;
- printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %d dhead %d anim %d pitch %d (%x, %x)\n",
+ printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %d dhead %d anim %d pitch %d (%x, %x, %x, %x, %x)\n",
p->spawnId, p->x, p->y, p->z,
p->deltaX, p->deltaY, p->deltaZ,
p->heading, p->deltaHeading,
p->animation, p->pitch,
- p->padding1, p->padding2 );
+ p->padding1, p->padding2,
+ p->padding3, p->padding4, p->padding5 );
#endif
@@ -1481,4 +1485,3 @@
#ifndef QMAKEBUILD
#include "player.moc"
#endif
-
Index: src/spawnshell.cpp
================================================== =================
--- src/spawnshell.cpp (revision 793)
+++ src/spawnshell.cpp (working copy)
@@ -918,19 +918,19 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/ unsigned pitch:12;
- signed z:19; // z coord
- unsigned padding01:1;
- /*0008*/ signed animation:10; // velocity
- unsigned padding04:3;
- signed deltaHeading:10; // change in heading
- unsigned padding02:9;
- /*0012*/ signed x:19; // x coord
unsigned heading:12; // heading
- unsigned padding03:01;
- /*0016*/ signed y:19; // y coord
+ unsigned padding04:1;
+ unsigned padding01:7;
+ /*0008*/ signed z:19; // z coord
+ signed deltaZ:13; // change in z
+ /*0012*/ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord
+ unsigned padding03:03;
+ /*0016*/ signed x:19; // x coord
+ signed animation:10; // velocity
+ unsigned padding02:3;
+ /*0020*/ signed deltaY:13; // change in y
signed deltaX:13; // change in x
- /*0020*/ signed deltaY:13; // change in y
- signed deltaZ:13; // change in z
unsigned padding05:2;
unsigned padding06:4;
/*0024*/
@@ -1812,4 +1812,3 @@
#ifndef QMAKEBUILD
#include "spawnshell.moc"
#endif
-
svn checkout http://svn.code.sf.net/p/seq/svn/showeq/trunk showeq
How to build from svn:
make -f Makefile.dist build
./configure
make
make install
Here is the diff:
Index: conf/zoneopcodes.xml
================================================== =================
--- conf/zoneopcodes.xml (revision 793)
+++ conf/zoneopcodes.xml (working copy)
@@ -3,33 +3,33 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="59ab" name="OP_PlayerProfile" updated="08/21/13">
+ <opcode id="03b5" name="OP_PlayerProfile" updated="10/08/13">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="500c" name="OP_ZoneEntry" updated="08/21/13">
+ <opcode id="078e" name="OP_ZoneEntry" updated="10/08/13">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5c79" name="OP_TimeOfDay" updated="08/21/13">
+ <opcode id="6b71" name="OP_TimeOfDay" updated="10/08/13">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1af6" name="OP_NewZone" updated="08/21/13">
+ <opcode id="0688" name="OP_NewZone" updated="10/08/13">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3f2c" name="OP_SpawnDoor" updated="08/21/13">
+ <opcode id="0d73" name="OP_SpawnDoor" updated="10/08/13">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="22ea" name="OP_GroundSpawn" updated="08/21/13">
+ <opcode id="77f4" name="OP_GroundSpawn" updated="10/08/13">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1b4d" name="OP_SendZonePoints" updated="08/21/13">
+ <opcode id="1549" name="OP_SendZonePoints" updated="10/08/13">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
@@ -41,40 +41,40 @@
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="55c1" name="OP_GuildMOTD" updated="08/21/13">
+ <opcode id="1d26" name="OP_GuildMOTD" updated="10/08/13">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="183d" name="OP_ClientUpdate" updated="08/21/13">
+ <opcode id="753d" name="OP_ClientUpdate" updated="10/08/13">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7417" name="OP_NpcMoveUpdate" updated="08/21/13">
+ <opcode id="41a9" name="OP_NpcMoveUpdate" updated="10/08/13">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="7905" name="OP_MobUpdate" updated="08/21/13">
+ <opcode id="374f" name="OP_MobUpdate" updated="10/08/13">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="5d22" name="OP_DeleteSpawn" updated="08/21/13">
+ <opcode id="21bd" name="OP_DeleteSpawn" updated="10/08/13">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2616" name="OP_RemoveSpawn" updated="08/21/13">
+ <opcode id="3d89" name="OP_RemoveSpawn" updated="10/08/13">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="0d78" name="OP_Death" updated="08/21/13">
+ <opcode id="68a0" name="OP_Death" updated="10/08/13">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="66ca" name="OP_WearChange" updated="08/21/13">
+ <opcode id="6a1b" name="OP_WearChange" updated="10/08/13">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2363" name="OP_SpawnAppearance" updated="08/21/13">
+ <opcode id="5135" name="OP_SpawnAppearance" updated="10/08/13">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -86,7 +86,7 @@
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7b11" name="OP_GuildMemberUpdate" updated="08/21/13">
+ <opcode id="2c52" name="OP_GuildMemberUpdate" updated="10/08/13">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
@@ -99,15 +99,15 @@
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4f6c" name="OP_Action2" updated="07/16/13">
+ <opcode id="349a" name="OP_Action2" updated="10/08/13">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="004f" name="OP_Consider" updated="08/21/13">
+ <opcode id="6a7f" name="OP_Consider" updated="10/08/13">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="69ad" name="OP_TargetMouse" updated="08/21/13">
+ <opcode id="0ac5" name="OP_TargetMouse" updated="10/08/13">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
Index: src/everquest.h
================================================== =================
--- src/everquest.h (revision 793)
+++ src/everquest.h (working copy)
@@ -1090,22 +1090,22 @@
{
struct
{
- unsigned pitch:12;
- signed z:19; // z coord
- unsigned padding01:1;
- signed animation:10; // velocity
- unsigned padding04:3;
- signed deltaHeading:10; // change in heading
- unsigned padding02:9;
- signed x:19; // x coord
- unsigned heading:12; // heading
- unsigned padding03:01;
- signed y:19; // y coord
- signed deltaX:13; // change in x
- signed deltaY:13; // change in y
- signed deltaZ:13; // change in z
- unsigned padding05:2;
- unsigned padding06:4;
+ unsigned pitch:12;
+ unsigned heading:12; // heading
+ unsigned padding04:1;
+ unsigned padding01:7;
+ signed z:19; // z coord
+ signed deltaZ:13; // change in z
+ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord
+ unsigned padding03:03;
+ signed x:19; // x coord
+ signed animation:10; // velocity
+ unsigned padding02:3;
+ signed deltaY:13; // change in y
+ signed deltaX:13; // change in x
+ unsigned padding05:2;
+ unsigned padding06:4;
};
int32_t posData[5];
};
@@ -2354,27 +2354,27 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/ unsigned pitch:12;
- signed z:19; // z coord
- unsigned padding01:1;
-/*0008*/ signed animation:10; // velocity
- unsigned padding04:3;
- signed deltaHeading:10; // change in heading
- unsigned padding02:9;
-/*0012*/ signed x:19; // x coord
- unsigned heading:12; // heading
- unsigned padding03:01;
-/*0016*/ signed y:19; // y coord
- signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned padding04:1;
+ unsigned padding01:7;
+/*0008*/ signed z:19; // z coord
+ signed deltaZ:13; // change in z
+/*0012*/ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord
+ unsigned padding03:03;
+/*0016*/ signed x:19; // x coord
+ signed animation:10; // velocity
+ unsigned padding02:3;
/*0020*/ signed deltaY:13; // change in y
- signed deltaZ:13; // change in z
- unsigned padding05:2;
- unsigned padding06:4;
+ signed deltaX:13; // change in x
+ unsigned padding05:2;
+ unsigned padding06:4;
/*0024*/
};
/*
** Self Position Update
-** Length: 38 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
@@ -2384,18 +2384,21 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/ unsigned pitch:12; // pitch (up/down heading)
- signed animation:10; // velocity
+ unsigned padding4:10;
unsigned padding1:10;
-/*0010*/ float deltaY; // Change in y
-/*0014*/ float y; // y coord (2nd loc value)
-/*0018*/ float deltaZ; // Change in z
-/*0022*/ float z; // z coord (3rd loc value)
-/*0026*/ float deltaX; // Change in x
-/*0030*/ float x; // x coord (1st loc value)
+/*0010*/ float z; // z coord (3rd loc value)
+/*0014*/ signed animation:10; // velocity
+ unsigned heading:12; // Directional heading
+ unsigned padding5:10;
+/*0018*/ float y; // y coord (2nd loc value)
+/*0022*/ float deltaX; // Change in x
+/*0026*/ float deltaZ; // Change in z
+/*0030*/ float deltaY; // Change in y
/*0034*/ signed deltaHeading:10; // change in heading
- unsigned heading:12; // Directional heading
- unsigned padding2:10; // ***Placeholder
-/*0038*/
+ unsigned padding3:10;
+ unsigned padding2:12; // ***Placeholder
+/*0038*/ float x; // x coord (1st loc value)
+/*0042*/
};
@@ -2693,4 +2696,4 @@
//. .7...6....,X....D4.M.\.....P.v..>..W....
//123456789012345678901234567890123456789012
-//000000000111111111122222222223333333333444
+//000000000111111111122222222223333333333444
\ No newline at end of file
Index: src/player.cpp
================================================== =================
--- src/player.cpp (revision 793)
+++ src/player.cpp (working copy)
@@ -852,27 +852,31 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/ unsigned pitch:12; // pitch (up/down heading)
- signed animation:10; // velocity
+ unsigned padding4:10;
unsigned padding1:10;
- /*0010*/ float deltaY; // Change in y
- /*0014*/ float y; // y coord (2nd loc value)
- /*0018*/ float deltaZ; // Change in z
- /*0022*/ float z; // z coord (3rd loc value)
- /*0026*/ float deltaX; // Change in x
- /*0030*/ float x; // x coord (1st loc value)
+ /*0010*/ float z; // z coord (3rd loc value)
+ /*0014*/ signed animation:10; // velocity
+ unsigned heading:12; // Directional heading
+ unsigned padding5:10;
+ /*0018*/ float y; // y coord (2nd loc value)
+ /*0022*/ float deltaX; // Change in x
+ /*0026*/ float deltaZ; // Change in z
+ /*0030*/ float deltaY; // Change in y
/*0034*/ signed deltaHeading:10; // change in heading
- unsigned heading:12; // Directional heading
- unsigned padding2:10; // ***Placeholder
- /*0038*/
+ unsigned padding3:10;
+ unsigned padding2:12; // ***Placeholder
+ /*0038*/ float x; // x coord (1st loc value)
+ /*0042*/
};
#pragma pack(0)
struct pos *p = (struct pos *)data;
- printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %d dhead %d anim %d pitch %d (%x, %x)\n",
+ printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %d dhead %d anim %d pitch %d (%x, %x, %x, %x, %x)\n",
p->spawnId, p->x, p->y, p->z,
p->deltaX, p->deltaY, p->deltaZ,
p->heading, p->deltaHeading,
p->animation, p->pitch,
- p->padding1, p->padding2 );
+ p->padding1, p->padding2,
+ p->padding3, p->padding4, p->padding5 );
#endif
@@ -1481,4 +1485,3 @@
#ifndef QMAKEBUILD
#include "player.moc"
#endif
-
Index: src/spawnshell.cpp
================================================== =================
--- src/spawnshell.cpp (revision 793)
+++ src/spawnshell.cpp (working copy)
@@ -918,19 +918,19 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/ unsigned pitch:12;
- signed z:19; // z coord
- unsigned padding01:1;
- /*0008*/ signed animation:10; // velocity
- unsigned padding04:3;
- signed deltaHeading:10; // change in heading
- unsigned padding02:9;
- /*0012*/ signed x:19; // x coord
unsigned heading:12; // heading
- unsigned padding03:01;
- /*0016*/ signed y:19; // y coord
+ unsigned padding04:1;
+ unsigned padding01:7;
+ /*0008*/ signed z:19; // z coord
+ signed deltaZ:13; // change in z
+ /*0012*/ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord
+ unsigned padding03:03;
+ /*0016*/ signed x:19; // x coord
+ signed animation:10; // velocity
+ unsigned padding02:3;
+ /*0020*/ signed deltaY:13; // change in y
signed deltaX:13; // change in x
- /*0020*/ signed deltaY:13; // change in y
- signed deltaZ:13; // change in z
unsigned padding05:2;
unsigned padding06:4;
/*0024*/
@@ -1812,4 +1812,3 @@
#ifndef QMAKEBUILD
#include "spawnshell.moc"
#endif
-