pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-17 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Brought Actor Position Update packets up to RoF2 standard in preparation for boat control modifications. Tested on all 6 supported clients - please report any anomalies

Browse Source
This commit is contained in:
Uleat 2019-11-16 17:10:40 -05:00
parent b56bc29388
commit 5fbda48c54
16 changed files with 272 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
common/eq_packet_structs.h
View File

@ -1359,20 +1359,23 @@ struct BecomeCorpse_Struct {
struct PlayerPositionUpdateServer_Struct struct PlayerPositionUpdateServer_Struct
{ {
/*0000*/ uint16 spawn_id; /*0000*/ uint16 spawn_id;
/*0002*/ int32 delta_heading:10, // change in heading /*0002*/ uint16 vehicle_id;
x_pos:19, // x coord /*0004*/ signed padding0004 : 12;
padding0002:3; // ***Placeholder signed y_pos : 19; // y coord
/*0006*/ int32 y_pos:19, // y coord unsigned padding : 1;
animation:10, // animation /*0008*/ signed delta_z : 13; // change in z
padding0006:3; // ***Placeholder signed delta_x : 13; // change in x
/*0010*/ int32 z_pos:19, // z coord signed padding0008 : 6;
delta_y:13; // change in y /*0012*/ signed x_pos : 19; // x coord
/*0014*/ int32 delta_x:13, // change in x unsigned heading : 12; // heading
heading:12, // heading signed padding0016 : 1;
padding0014:7; // ***Placeholder /*0016*/ signed delta_heading : 10; // change in heading
/*0018*/ int32 delta_z:13, // change in z signed z_pos : 19; // z coord
padding0018:19; // ***Placeholder signed padding0020 : 3;
/*0022*/ /*0020*/ signed animation : 10; // animation
signed delta_y : 13; // change in y
signed padding0024 : 9;
/*0024*/
}; };
/* /*
@ -1383,21 +1386,23 @@ struct PlayerPositionUpdateServer_Struct
*/ */
struct PlayerPositionUpdateClient_Struct struct PlayerPositionUpdateClient_Struct
{ {
/*0000*/ uint16 spawn_id; /*0000*/ uint16 sequence; // increments one each packet - Verified
/*0002*/ uint16 sequence; //increments one each packet /*0002*/ uint16 spawn_id; // Player's spawn id
/*0004*/ float y_pos; // y coord /*0004*/ uint16 vehicle_id; // Player's vehicle spawn id
/*0008*/ float delta_z; // Change in z /*0006*/ uint8 unknown0004[4]; // ***Placeholder
/*0012*/ float delta_x; // Change in x /*0010*/ float delta_x; // Change in x
/*0016*/ float delta_y; // Change in y /*0014*/ unsigned heading : 12; // Directional heading
/*0020*/ int32 animation:10, // animation unsigned padding0040 : 20; // ***Placeholder
delta_heading:10, // change in heading /*0018*/ float x_pos; // x coord (2nd loc value)
padding0020:12; // ***Placeholder (mostly 1) /*0022*/ float delta_z; // Change in z
/*0024*/ float x_pos; // x coord /*0026*/ float z_pos; // z coord (3rd loc value)
/*0028*/ float z_pos; // z coord /*0030*/ float y_pos; // y coord (1st loc value)
/*0032*/ uint16 heading:12, // Directional heading /*0034*/ unsigned animation : 10; // ***Placeholder
padding0004:4; // ***Placeholder unsigned padding0024 : 22; // animation
/*0034*/ uint8 unknown0006[2]; // ***Placeholder /*0038*/ float delta_y; // Change in y
/*0036*/ /*0042*/ signed delta_heading : 10; // change in heading
unsigned padding0041 : 22; // ***Placeholder
/*0046*/
}; };
struct SpawnPositionUpdate_Struct struct SpawnPositionUpdate_Struct

2
common/patches/rof.cpp
View File

@ -624,6 +624,7 @@ namespace RoF
SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct); SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
OUT(spawn_id); OUT(spawn_id);
OUT(vehicle_id);
OUT(x_pos); OUT(x_pos);
OUT(delta_x); OUT(delta_x);
OUT(delta_y); OUT(delta_y);
@ -4314,6 +4315,7 @@ namespace RoF
SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct); SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
IN(spawn_id); IN(spawn_id);
IN(vehicle_id);
IN(sequence); IN(sequence);
IN(x_pos); IN(x_pos);
IN(y_pos); IN(y_pos);

40
common/patches/rof2.cpp
View File

@ -686,25 +686,6 @@ namespace RoF2
FINISH_ENCODE(); FINISH_ENCODE();
} }
ENCODE(OP_ClientUpdate)
{
ENCODE_LENGTH_EXACT(PlayerPositionUpdateServer_Struct);
SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
OUT(spawn_id);
OUT(x_pos);
OUT(delta_x);
OUT(delta_y);
OUT(z_pos);
OUT(delta_heading);
OUT(y_pos);
OUT(delta_z);
OUT(animation);
OUT(heading);
FINISH_ENCODE();
}
ENCODE(OP_Consider) ENCODE(OP_Consider)
{ {
ENCODE_LENGTH_EXACT(Consider_Struct); ENCODE_LENGTH_EXACT(Consider_Struct);
@ -4545,27 +4526,6 @@ namespace RoF2
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }
DECODE(OP_ClientUpdate)
{
// for some odd reason, there is an extra byte on the end of this on occasion..
DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct);
SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
IN(spawn_id);
IN(sequence);
IN(x_pos);
IN(y_pos);
IN(z_pos);
IN(heading);
IN(delta_x);
IN(delta_y);
IN(delta_z);
IN(delta_heading);
IN(animation);
FINISH_DIRECT_DECODE();
}
DECODE(OP_Consider) DECODE(OP_Consider)
{ {
DECODE_LENGTH_EXACT(structs::Consider_Struct); DECODE_LENGTH_EXACT(structs::Consider_Struct);

2
common/patches/rof2_ops.h
View File

@ -52,7 +52,6 @@ E(OP_CastSpell)
E(OP_ChannelMessage) E(OP_ChannelMessage)
E(OP_CharInventory) E(OP_CharInventory)
E(OP_ClickObjectAction) E(OP_ClickObjectAction)
E(OP_ClientUpdate)
E(OP_Consider) E(OP_Consider)
E(OP_Damage) E(OP_Damage)
E(OP_DeleteCharge) E(OP_DeleteCharge)
@ -155,7 +154,6 @@ D(OP_BuffRemoveRequest)
D(OP_CastSpell) D(OP_CastSpell)
D(OP_ChannelMessage) D(OP_ChannelMessage)
D(OP_CharacterCreate) D(OP_CharacterCreate)
D(OP_ClientUpdate)
D(OP_Consider) D(OP_Consider)
D(OP_ConsiderCorpse) D(OP_ConsiderCorpse)
D(OP_Consume) D(OP_Consume)

5
common/patches/rof2_structs.h
View File

@ -1621,7 +1621,7 @@ struct RespawnWindow_Struct {
struct PlayerPositionUpdateServer_Struct struct PlayerPositionUpdateServer_Struct
{ {
/*0000*/ uint16 spawn_id; /*0000*/ uint16 spawn_id;
/*0002*/ uint16 spawnId2; /*0002*/ uint16 vehicle_id;
/*0004*/ signed padding0004 : 12; /*0004*/ signed padding0004 : 12;
signed y_pos : 19; // y coord signed y_pos : 19; // y coord
unsigned padding : 1; unsigned padding : 1;
@ -1650,7 +1650,8 @@ struct PlayerPositionUpdateClient_Struct
{ {
/*0000*/ uint16 sequence; // increments one each packet - Verified /*0000*/ uint16 sequence; // increments one each packet - Verified
/*0002*/ uint16 spawn_id; // Player's spawn id /*0002*/ uint16 spawn_id; // Player's spawn id
/*0004*/ uint8 unknown0004[6]; // ***Placeholder /*0004*/ uint16 vehicle_id; // Player's vehicle spawn id
/*0006*/ uint8 unknown0004[4]; // ***Placeholder
/*0010*/ float delta_x; // Change in x /*0010*/ float delta_x; // Change in x
/*0014*/ unsigned heading : 12; // Directional heading /*0014*/ unsigned heading : 12; // Directional heading
unsigned padding0040 : 20; // ***Placeholder unsigned padding0040 : 20; // ***Placeholder

5
common/patches/rof_structs.h
View File

@ -1609,7 +1609,7 @@ struct RespawnWindow_Struct {
struct PlayerPositionUpdateServer_Struct struct PlayerPositionUpdateServer_Struct
{ {
/*0000*/ uint16 spawn_id; /*0000*/ uint16 spawn_id;
/*0002*/ uint16 spawnId2; /*0002*/ uint16 vehicle_id;
/*0004*/ signed padding0004 : 12; /*0004*/ signed padding0004 : 12;
signed y_pos : 19; // y coord signed y_pos : 19; // y coord
unsigned padding : 1; unsigned padding : 1;
@ -1638,7 +1638,8 @@ struct PlayerPositionUpdateClient_Struct
{ {
/*0000*/ uint16 sequence; // increments one each packet - Verified /*0000*/ uint16 sequence; // increments one each packet - Verified
/*0002*/ uint16 spawn_id; // Player's spawn id /*0002*/ uint16 spawn_id; // Player's spawn id
/*0004*/ uint8 unknown0004[6]; // ***Placeholder /*0004*/ uint16 vehicle_id; // Player's vehicle spawn id
/*0006*/ uint8 unknown0004[4]; // ***Placeholder
/*0010*/ float delta_y; // Change in y /*0010*/ float delta_y; // Change in y
/*0014*/ float x_pos; // x coord (2nd loc value) /*0014*/ float x_pos; // x coord (2nd loc value)
/*0018*/ float y_pos; // y coord (1st loc value) /*0018*/ float y_pos; // y coord (1st loc value)

1
common/patches/sod.cpp
View File

@ -2926,6 +2926,7 @@ namespace SoD
IN(delta_z); IN(delta_z);
IN(delta_heading); IN(delta_heading);
IN(animation); IN(animation);
emu->vehicle_id = 0;
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }

1
common/patches/sof.cpp
View File

@ -2387,6 +2387,7 @@ namespace SoF
IN(delta_z); IN(delta_z);
IN(delta_heading); IN(delta_heading);
IN(animation); IN(animation);
emu->vehicle_id = 0;
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }

41
common/patches/titanium.cpp
View File

@ -350,6 +350,25 @@ namespace Titanium
dest->FastQueuePacket(&in, ack_req); dest->FastQueuePacket(&in, ack_req);
} }
ENCODE(OP_ClientUpdate)
{
ENCODE_LENGTH_EXACT(PlayerPositionUpdateServer_Struct);
SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
OUT(spawn_id);
OUT(x_pos);
OUT(delta_x);
OUT(delta_y);
OUT(z_pos);
OUT(delta_heading);
OUT(y_pos);
OUT(delta_z);
OUT(animation);
OUT(heading);
FINISH_ENCODE();
}
ENCODE(OP_Damage) ENCODE(OP_Damage)
{ {
ENCODE_LENGTH_EXACT(CombatDamage_Struct); ENCODE_LENGTH_EXACT(CombatDamage_Struct);
@ -1878,6 +1897,28 @@ namespace Titanium
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }
DECODE(OP_ClientUpdate)
{
// for some odd reason, there is an extra byte on the end of this on occasion.. (copied from SoF..not sure if applies to Ti - TODO: check)
DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct);
SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
IN(spawn_id);
IN(sequence);
IN(x_pos);
IN(y_pos);
IN(z_pos);
IN(heading);
IN(delta_x);
IN(delta_y);
IN(delta_z);
IN(delta_heading);
IN(animation);
emu->vehicle_id = 0;
FINISH_DIRECT_DECODE();
}
DECODE(OP_Consume) DECODE(OP_Consume)
{ {
DECODE_LENGTH_EXACT(structs::Consume_Struct); DECODE_LENGTH_EXACT(structs::Consume_Struct);

2
common/patches/titanium_ops.h
View File

@ -27,6 +27,7 @@ E(OP_BecomeTrader)
E(OP_Buff) E(OP_Buff)
E(OP_ChannelMessage) E(OP_ChannelMessage)
E(OP_CharInventory) E(OP_CharInventory)
E(OP_ClientUpdate)
E(OP_Damage) E(OP_Damage)
E(OP_DeleteCharge) E(OP_DeleteCharge)
E(OP_DeleteItem) E(OP_DeleteItem)
@ -82,6 +83,7 @@ D(OP_Bug)
D(OP_CastSpell) D(OP_CastSpell)
D(OP_ChannelMessage) D(OP_ChannelMessage)
D(OP_CharacterCreate) D(OP_CharacterCreate)
D(OP_ClientUpdate)
D(OP_Consume) D(OP_Consume)
D(OP_DeleteItem) D(OP_DeleteItem)
D(OP_Emote) D(OP_Emote)

1
common/patches/uf.cpp
View File

@ -3252,6 +3252,7 @@ namespace UF
IN(delta_z); IN(delta_z);
IN(delta_heading); IN(delta_heading);
IN(animation); IN(animation);
emu->vehicle_id = 0;
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }

9
zone/mob.cpp
View File

@ -4445,10 +4445,11 @@ void Mob::DoKnockback(Mob *caster, uint32 pushback, uint32 pushup)
spu->delta_y = FloatToEQ13(static_cast<float>(new_y)); spu->delta_y = FloatToEQ13(static_cast<float>(new_y));
spu->delta_z = FloatToEQ13(static_cast<float>(pushup)); spu->delta_z = FloatToEQ13(static_cast<float>(pushup));
spu->heading = FloatToEQ12(GetHeading()); spu->heading = FloatToEQ12(GetHeading());
spu->padding0002 =0; // for ref: these were not passed on to other 5 clients while on Titanium standard (change to RoF2 standard: 11/16/2019)
spu->padding0006 =7; //eq->padding0002 = 0;
spu->padding0014 =0x7f; //eq->padding0006 = 0x7;
spu->padding0018 =0x5df27; //eq->padding0014 = 0x7F;
//eq->padding0018 = 0x5dF27;
spu->animation = 0; spu->animation = 0;
spu->delta_heading = FloatToEQ10(0); spu->delta_heading = FloatToEQ10(0);
outapp_push->priority = 6; outapp_push->priority = 6;