pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-24 07:32:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

All animation structs were backwards and poorly named.. RoF+ animations work properly

Browse Source
This commit is contained in:
Natedog2012 2015-04-06 03:01:48 -07:00
parent 78eb8747aa
commit 7662eaf983
11 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/eq_packet_structs.h
View File

@ -1279,8 +1279,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 action; /*02*/ uint8 speed;
/*03*/ uint8 value; /*03*/ uint8 action;
/*04*/ /*04*/
}; };

2
common/patches/rof.cpp
View File

@ -227,8 +227,8 @@ namespace RoF
SETUP_DIRECT_ENCODE(Animation_Struct, structs::Animation_Struct); SETUP_DIRECT_ENCODE(Animation_Struct, structs::Animation_Struct);
OUT(spawnid); OUT(spawnid);
OUT(value);
OUT(action); OUT(action);
OUT(speed);
FINISH_ENCODE(); FINISH_ENCODE();
} }

2
common/patches/rof2.cpp
View File

@ -293,8 +293,8 @@ namespace RoF2
SETUP_DIRECT_ENCODE(Animation_Struct, structs::Animation_Struct); SETUP_DIRECT_ENCODE(Animation_Struct, structs::Animation_Struct);
OUT(spawnid); OUT(spawnid);
OUT(value);
OUT(action); OUT(action);
OUT(speed);
FINISH_ENCODE(); FINISH_ENCODE();
} }

4
common/patches/rof2_structs.h
View File

@ -1418,8 +1418,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 value; /*02*/ uint8 action;
/*03*/ uint8 action; /*03*/ uint8 speed;
/*04*/ /*04*/
}; };

4
common/patches/rof_structs.h
View File

@ -1448,8 +1448,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 value; /*02*/ uint8 action;
/*03*/ uint8 action; /*03*/ uint8 speed;
/*04*/ /*04*/
}; };

4
common/patches/sod_structs.h
View File

@ -1205,8 +1205,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 action; /*02*/ uint8 speed;
/*03*/ uint8 value; /*03*/ uint8 action;
/*04*/ /*04*/
}; };

4
common/patches/sof_structs.h
View File

@ -1182,8 +1182,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 action; /*02*/ uint8 speed;
/*03*/ uint8 value; /*03*/ uint8 action;
/*04*/ /*04*/
}; };

4
common/patches/titanium_structs.h
View File

@ -1062,8 +1062,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 action; /*02*/ uint8 speed;
/*03*/ uint8 value; /*03*/ uint8 action;
/*04*/ /*04*/
}; };

4
common/patches/uf_structs.h
View File

@ -1260,8 +1260,8 @@ struct RequestClientZoneChange_Struct {
struct Animation_Struct { struct Animation_Struct {
/*00*/ uint16 spawnid; /*00*/ uint16 spawnid;
/*02*/ uint8 action; /*02*/ uint8 speed;
/*03*/ uint8 value; /*03*/ uint8 action;
/*04*/ /*04*/
}; };

7
zone/client_packet.cpp
View File

@ -2831,8 +2831,11 @@ void Client::Handle_OP_Animation(const EQApplicationPacket *app)
Animation_Struct *s = (Animation_Struct *)app->pBuffer; Animation_Struct *s = (Animation_Struct *)app->pBuffer;
//might verify spawn ID, but it wouldent affect anything //might verify spawn ID, but it wouldent affect anything
if (GetClientVersion() >= ClientVersion::RoF) {
DoAnim(s->action, s->value); DoAnim(s->speed, s->action); //This was backwards so we gotta make up for it here
} else {
DoAnim(s->action, s->speed);
}
return; return;
} }

6
zone/mob.cpp
View File

@ -1314,12 +1314,12 @@ void Mob::DoAnim(const int animnum, int type, bool ackreq, eqFilterType filter)
Animation_Struct* anim = (Animation_Struct*)outapp->pBuffer; Animation_Struct* anim = (Animation_Struct*)outapp->pBuffer;
anim->spawnid = GetID(); anim->spawnid = GetID();
if(type == 0){ if(type == 0){
anim->action = 10; anim->action = animnum;
anim->value=animnum; anim->speed = 10;
} }
else{ else{
anim->action = animnum; anim->action = animnum;
anim->value=type; anim->speed = type;
} }
entity_list.QueueCloseClients(this, outapp, false, 200, 0, ackreq, filter); entity_list.QueueCloseClients(this, outapp, false, 200, 0, ackreq, filter);
safe_delete(outapp); safe_delete(outapp);