thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to fix joining netgames being broken

Browse source
This commit is contained in:
SteelT 2020-08-20 20:28:48 -04:00
parent 83c3b7cc2d
commit ccff8dc2ba
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/p_saveg.c
View file

@ -164,6 +164,9 @@ static void P_NetArchivePlayers(void)
WRITEINT32(save_p, players[i].ctfteam); WRITEINT32(save_p, players[i].ctfteam);
WRITEUINT16(save_p, players[i].gotflag); WRITEUINT16(save_p, players[i].gotflag);
WRITEINT32(save_p, players[i].weapondelay);
WRITEINT32(save_p, players[i].tossdelay);
WRITEANGLE(save_p, players[i].angle_pos); WRITEANGLE(save_p, players[i].angle_pos);
WRITEANGLE(save_p, players[i].old_angle_pos); WRITEANGLE(save_p, players[i].old_angle_pos);
@ -200,6 +203,15 @@ static void P_NetArchivePlayers(void)
WRITEUINT8(save_p, players[i].texttimer); WRITEUINT8(save_p, players[i].texttimer);
WRITEUINT8(save_p, players[i].textvar); WRITEUINT8(save_p, players[i].textvar);
if (players[i].awayviewmobj)
flags |= AWAYVIEW;
if (players[i].followmobj)
flags |= FOLLOWITEM;
if (players[i].follower)
flags |= FOLLOWER;
WRITEINT16(save_p, players[i].lastsidehit); WRITEINT16(save_p, players[i].lastsidehit);
WRITEINT16(save_p, players[i].lastlinehit); WRITEINT16(save_p, players[i].lastlinehit);
@ -214,15 +226,6 @@ static void P_NetArchivePlayers(void)
WRITEUINT8(save_p, players[i].splitscreenindex); WRITEUINT8(save_p, players[i].splitscreenindex);
if (players[i].awayviewmobj)
flags |= AWAYVIEW;
if (players[i].followmobj)
flags |= FOLLOWITEM;
if (players[i].follower)
flags |= FOLLOWER;
WRITEUINT16(save_p, flags); WRITEUINT16(save_p, flags);
if (flags & AWAYVIEW) if (flags & AWAYVIEW)
@ -230,6 +233,7 @@ static void P_NetArchivePlayers(void)
if (flags & FOLLOWITEM) if (flags & FOLLOWITEM)
WRITEUINT32(save_p, players[i].followmobj->mobjnum); WRITEUINT32(save_p, players[i].followmobj->mobjnum);
WRITEUINT32(save_p, (UINT32)players[i].followitem); WRITEUINT32(save_p, (UINT32)players[i].followitem);
WRITEUINT32(save_p, players[i].charflags); WRITEUINT32(save_p, players[i].charflags);
@ -420,6 +424,7 @@ static void P_NetUnArchivePlayers(void)
if (flags & FOLLOWITEM) if (flags & FOLLOWITEM)
players[i].followmobj = (mobj_t *)(size_t)READUINT32(save_p); players[i].followmobj = (mobj_t *)(size_t)READUINT32(save_p);
players[i].followitem = (mobjtype_t)READUINT32(save_p); players[i].followitem = (mobjtype_t)READUINT32(save_p);
//SetPlayerSkinByNum(i, players[i].skin); //SetPlayerSkinByNum(i, players[i].skin);
@ -435,8 +440,6 @@ static void P_NetUnArchivePlayers(void)
if (flags & FOLLOWER) if (flags & FOLLOWER)
players[i].follower = (mobj_t *)(size_t)READUINT32(save_p); players[i].follower = (mobj_t *)(size_t)READUINT32(save_p);
//
for (j = 0; j < NUMKARTSTUFF; j++) for (j = 0; j < NUMKARTSTUFF; j++)
players[i].kartstuff[j] = READINT32(save_p); players[i].kartstuff[j] = READINT32(save_p);