G_PlayerReborn desync fix, maybe?
This commit is contained in:
parent
6381791ca6
commit
3cdcaa6f2f
|
@ -520,7 +520,7 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
|
||||||
for (j = 0; j < NUMKARTSTUFF; ++j)
|
for (j = 0; j < NUMKARTSTUFF; ++j)
|
||||||
rsp->kartstuff[j] = (UINT16)SHORT(players[i].kartstuff[j]); // SRB2kart
|
rsp->kartstuff[j] = (UINT16)SHORT(players[i].kartstuff[j]); // SRB2kart
|
||||||
for (j = 0; j < MAXPLAYERS; ++j)
|
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
|
// Score is resynched in the rspfirm resync packet
|
||||||
rsp->health = 0; // resynched with mo health
|
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)
|
for (j = 0; j < NUMKARTSTUFF; ++j)
|
||||||
players[i].kartstuff[j] = (UINT16)SHORT(rsp->kartstuff[j]); // SRB2kart
|
players[i].kartstuff[j] = (UINT16)SHORT(rsp->kartstuff[j]); // SRB2kart
|
||||||
for (j = 0; j < MAXPLAYERS; ++j)
|
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
|
// Score is resynched in the rspfirm resync packet
|
||||||
players[i].health = rsp->health;
|
players[i].health = rsp->health;
|
||||||
|
|
12
src/g_game.c
12
src/g_game.c
|
@ -2194,8 +2194,8 @@ void G_PlayerReborn(INT32 player)
|
||||||
SINT8 pity;
|
SINT8 pity;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
INT32 starpostwp;
|
//INT32 starpostwp;
|
||||||
INT32 offroad;
|
//INT32 offroad;
|
||||||
|
|
||||||
score = players[player].score;
|
score = players[player].score;
|
||||||
lives = players[player].lives;
|
lives = players[player].lives;
|
||||||
|
@ -2248,8 +2248,8 @@ void G_PlayerReborn(INT32 player)
|
||||||
pity = players[player].pity;
|
pity = players[player].pity;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
starpostwp = players[player].kartstuff[k_starpostwp];
|
//starpostwp = players[player].kartstuff[k_starpostwp];
|
||||||
offroad = players[player].kartstuff[k_offroad];
|
//offroad = players[player].kartstuff[k_offroad];
|
||||||
|
|
||||||
p = &players[player];
|
p = &players[player];
|
||||||
memset(p, 0, sizeof (*p));
|
memset(p, 0, sizeof (*p));
|
||||||
|
@ -2303,8 +2303,8 @@ void G_PlayerReborn(INT32 player)
|
||||||
p->pity = pity;
|
p->pity = pity;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
p->kartstuff[k_starpostwp] = starpostwp;
|
//p->kartstuff[k_starpostwp] = starpostwp;
|
||||||
p->kartstuff[k_offroad] = offroad;
|
//p->kartstuff[k_offroad] = offroad;
|
||||||
|
|
||||||
// Don't do anything immediately
|
// Don't do anything immediately
|
||||||
p->pflags |= PF_USEDOWN;
|
p->pflags |= PF_USEDOWN;
|
||||||
|
|
Loading…
Reference in New Issue