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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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;
anim->spawnid = GetID();
if(type == 0){
anim->action = 10;
anim->value=animnum;
anim->action = animnum;
anim->speed = 10;
}
else{
anim->action = animnum;
anim->value=type;
anim->speed = type;
}
entity_list.QueueCloseClients(this, outapp, false, 200, 0, ackreq, filter);
safe_delete(outapp);