stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-03-22 10:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

G_PlayerReborn desync fix, maybe?

Browse source
This commit is contained in:
ZTsukei 2017-06-26 21:40:45 -04:00
parent 6381791ca6
commit 3cdcaa6f2f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_clisrv.c
View file

@ -520,7 +520,7 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
for (j = 0; j < NUMKARTSTUFF; ++j)
rsp->kartstuff[j] = (UINT16)SHORT(players[i].kartstuff[j]); // SRB2kart
for (j = 0; j < MAXPLAYERS; ++j)
rsp->collide[j] = players[i].collide[j]; // SRB2kart
rsp->collide[j] = (UINT16)SHORT(players[i].collide[j]); // SRB2kart
// Score is resynched in the rspfirm resync packet
rsp->health = 0; // resynched with mo health
@ -654,7 +654,7 @@ static void resynch_read_player(resynch_pak *rsp)
for (j = 0; j < NUMKARTSTUFF; ++j)
players[i].kartstuff[j] = (UINT16)SHORT(rsp->kartstuff[j]); // SRB2kart
for (j = 0; j < MAXPLAYERS; ++j)
players[i].collide[j] = rsp->collide[j]; // SRB2kart
players[i].collide[j] = (UINT16)SHORT(rsp->collide[j]); // SRB2kart
// Score is resynched in the rspfirm resync packet
players[i].health = rsp->health;

12
src/g_game.c
View file

@ -2194,8 +2194,8 @@ void G_PlayerReborn(INT32 player)
SINT8 pity;
// SRB2kart
INT32 starpostwp;
INT32 offroad;
//INT32 starpostwp;
//INT32 offroad;
score = players[player].score;
lives = players[player].lives;
@ -2248,8 +2248,8 @@ void G_PlayerReborn(INT32 player)
pity = players[player].pity;
// SRB2kart
starpostwp = players[player].kartstuff[k_starpostwp];
offroad = players[player].kartstuff[k_offroad];
//starpostwp = players[player].kartstuff[k_starpostwp];
//offroad = players[player].kartstuff[k_offroad];
p = &players[player];
memset(p, 0, sizeof (*p));
@ -2303,8 +2303,8 @@ void G_PlayerReborn(INT32 player)
p->pity = pity;
// SRB2kart
p->kartstuff[k_starpostwp] = starpostwp;
p->kartstuff[k_offroad] = offroad;
//p->kartstuff[k_starpostwp] = starpostwp;
//p->kartstuff[k_offroad] = offroad;
// Don't do anything immediately
p->pflags |= PF_USEDOWN;