stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-17 23:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up for player->mo resyncing

Browse source 
Make most of the order match the struct, make sure proper type conversions are used when needed
This commit is contained in:
TehRealSalt 2018-10-30 18:20:56 -04:00
parent f9d559b03c
commit f1ea725319
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/d_clisrv.c
View file

@ -658,26 +658,26 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
rsp->health = LONG(players[i].mo->health); rsp->health = LONG(players[i].mo->health);
rsp->angle = (angle_t)LONG(players[i].mo->angle); rsp->angle = (angle_t)LONG(players[i].mo->angle);
rsp->x = LONG(players[i].mo->x); rsp->x = (fixed_t)LONG(players[i].mo->x);
rsp->y = LONG(players[i].mo->y); rsp->y = (fixed_t)LONG(players[i].mo->y);
rsp->z = LONG(players[i].mo->z); rsp->z = (fixed_t)LONG(players[i].mo->z);
rsp->momx = LONG(players[i].mo->momx); rsp->momx = (fixed_t)LONG(players[i].mo->momx);
rsp->momy = LONG(players[i].mo->momy); rsp->momy = (fixed_t)LONG(players[i].mo->momy);
rsp->momz = LONG(players[i].mo->momz); rsp->momz = (fixed_t)LONG(players[i].mo->momz);
rsp->friction = LONG(players[i].mo->friction); rsp->friction = (fixed_t)LONG(players[i].mo->friction);
rsp->movefactor = LONG(players[i].mo->movefactor); rsp->movefactor = (fixed_t)LONG(players[i].mo->movefactor);
rsp->tics = LONG(players[i].mo->tics); rsp->tics = LONG(players[i].mo->tics);
rsp->statenum = (statenum_t)LONG(players[i].mo->state-states); // :( rsp->statenum = (statenum_t)LONG(players[i].mo->state-states); // :(
rsp->flags = (UINT32)LONG(players[i].mo->flags);
rsp->flags2 = (UINT32)LONG(players[i].mo->flags2);
rsp->eflags = (UINT16)SHORT(players[i].mo->eflags); rsp->eflags = (UINT16)SHORT(players[i].mo->eflags);
rsp->flags = LONG(players[i].mo->flags);
rsp->flags2 = LONG(players[i].mo->flags2);
rsp->radius = LONG(players[i].mo->radius); rsp->radius = (fixed_t)LONG(players[i].mo->radius);
rsp->height = LONG(players[i].mo->height); rsp->height = (fixed_t)LONG(players[i].mo->height);
rsp->scale = LONG(players[i].mo->scale); rsp->scale = (fixed_t)LONG(players[i].mo->scale);
rsp->destscale = LONG(players[i].mo->destscale); rsp->destscale = (fixed_t)LONG(players[i].mo->destscale);
rsp->scalespeed = LONG(players[i].mo->scalespeed); rsp->scalespeed = (fixed_t)LONG(players[i].mo->scalespeed);
} }
static void resynch_read_player(resynch_pak *rsp) static void resynch_read_player(resynch_pak *rsp)
@ -802,27 +802,30 @@ static void resynch_read_player(resynch_pak *rsp)
//At this point, the player should have a body, whether they were respawned or not. //At this point, the player should have a body, whether they were respawned or not.
P_UnsetThingPosition(players[i].mo); P_UnsetThingPosition(players[i].mo);
players[i].mo->angle = (angle_t)LONG(rsp->angle);
players[i].mo->eflags = (UINT16)SHORT(rsp->eflags);
players[i].mo->flags = LONG(rsp->flags);
players[i].mo->flags2 = LONG(rsp->flags2);
players[i].mo->friction = LONG(rsp->friction);
players[i].mo->health = LONG(rsp->health); players[i].mo->health = LONG(rsp->health);
players[i].mo->momx = LONG(rsp->momx);
players[i].mo->momy = LONG(rsp->momy); players[i].mo->angle = (angle_t)LONG(rsp->angle);
players[i].mo->momz = LONG(rsp->momz); players[i].mo->x = (fixed_t)LONG(rsp->x);
players[i].mo->movefactor = LONG(rsp->movefactor); players[i].mo->y = (fixed_t)LONG(rsp->y);
players[i].mo->z = (fixed_t)LONG(rsp->z);
players[i].mo->momx = (fixed_t)LONG(rsp->momx);
players[i].mo->momy = (fixed_t)LONG(rsp->momy);
players[i].mo->momz = (fixed_t)LONG(rsp->momz);
players[i].mo->friction = (fixed_t)LONG(rsp->friction);
players[i].mo->movefactor = (fixed_t)LONG(rsp->movefactor);
players[i].mo->tics = LONG(rsp->tics); players[i].mo->tics = LONG(rsp->tics);
P_SetMobjStateNF(players[i].mo, LONG(rsp->statenum)); P_SetMobjStateNF(players[i].mo, (statenum_t)LONG(rsp->statenum));
players[i].mo->x = LONG(rsp->x); players[i].mo->flags = (UINT32)LONG(rsp->flags);
players[i].mo->y = LONG(rsp->y); players[i].mo->flags2 = (UINT32)LONG(rsp->flags2);
players[i].mo->z = LONG(rsp->z); players[i].mo->eflags = (UINT16)SHORT(rsp->eflags);
players[i].mo->radius = LONG(rsp->radius);
players[i].mo->height = LONG(rsp->height); players[i].mo->radius = (fixed_t)LONG(rsp->radius);
players[i].mo->height = (fixed_t)LONG(rsp->height);
// P_SetScale is redundant for this, as all related variables are already restored properly. // P_SetScale is redundant for this, as all related variables are already restored properly.
players[i].mo->scale = LONG(rsp->scale); players[i].mo->scale = (fixed_t)LONG(rsp->scale);
players[i].mo->destscale = LONG(rsp->destscale); players[i].mo->destscale = (fixed_t)LONG(rsp->destscale);
players[i].mo->scalespeed = LONG(rsp->scalespeed); players[i].mo->scalespeed = (fixed_t)LONG(rsp->scalespeed);
// And finally, SET THE MOBJ SKIN damn it. // And finally, SET THE MOBJ SKIN damn it.
players[i].mo->skin = &skins[players[i].skin]; players[i].mo->skin = &skins[players[i].skin];