From 3cdcaa6f2fa1db1b7b24427a812289bb43b8be75 Mon Sep 17 00:00:00 2001 From: ZTsukei Date: Mon, 26 Jun 2017 21:40:45 -0400 Subject: [PATCH] G_PlayerReborn desync fix, maybe? --- src/d_clisrv.c | 4 ++-- src/g_game.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index ad8b93e0..a893051c 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -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; diff --git a/src/g_game.c b/src/g_game.c index 68bcaa76..dc563c68 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -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;