diff --git a/src/g_demo.c b/src/g_demo.c index 197d325ee..f0d31ae39 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -246,10 +246,12 @@ void G_ReadDemoExtraData(void) { extradata = READUINT8(demobuf.p); + player_t *player = &players[p]; + if (extradata & DXD_RESPAWN) { - if (players[p].mo) - P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL); // Is this how this should work..? + if (player->mo) + P_DamageMobj(player->mo, NULL, NULL, DMG_INSTAKILL); // Is this how this should work..? } if (extradata & DXD_SKIN) @@ -264,11 +266,11 @@ void G_ReadDemoExtraData(void) kartspeed = READUINT8(demobuf.p); kartweight = READUINT8(demobuf.p); - if (!fasticmp(skins[players[p].skin].name, name)) + if (!fasticmp(skins[player->skin].name, name)) FindClosestSkinForStats(p, kartspeed, kartweight); - players[p].kartspeed = kartspeed; - players[p].kartweight = kartweight; + player->kartspeed = kartspeed; + player->kartweight = kartweight; } if (extradata & DXD_COLOR) @@ -279,9 +281,9 @@ void G_ReadDemoExtraData(void) for (i = 0; i < MAXSKINCOLORS; i++) if (fasticmp(KartColor_Names[i], name)) // SRB2kart { - players[p].skincolor = i; - if (players[p].mo) - players[p].mo->color = i; + player->skincolor = i; + if (player->mo) + player->mo->color = i; break; } } @@ -300,17 +302,17 @@ void G_ReadDemoExtraData(void) switch (extradata) { case DXD_PST_PLAYING: - players[p].pflags |= PF_WANTSTOJOIN; // fuck you + player->pflags |= PF_WANTSTOJOIN; // fuck you break; case DXD_PST_SPECTATING: - players[p].pflags &= ~PF_WANTSTOJOIN; // double-fuck you + player->pflags &= ~PF_WANTSTOJOIN; // double-fuck you if (!playeringame[p]) { CL_ClearPlayer(p); playeringame[p] = true; G_AddPlayer(p); - players[p].spectator = true; + player->spectator = true; // There's likely an off-by-one error in timing recording or playback of joins. This hacks around it so I don't have to find out where that is. \o/ if (oldcmd[p].forwardmove) @@ -318,11 +320,11 @@ void G_ReadDemoExtraData(void) } else { - players[p].spectator = true; - if (players[p].mo) - P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL); + player->spectator = true; + if (player->mo) + P_DamageMobj(player->mo, NULL, NULL, DMG_INSTAKILL); else - players[p].playerstate = PST_REBORN; + player->playerstate = PST_REBORN; } break; case DXD_PST_LEFT: @@ -330,7 +332,7 @@ void G_ReadDemoExtraData(void) break; } - G_ResetViews(); + G_ResetViews(false); // dont reset our freecam pls thx! // maybe these are necessary? if (G_BattleGametype()) @@ -1584,7 +1586,7 @@ void G_ConfirmRewind(tic_t rewindtime) displayplayers[2] = olddp3; displayplayers[3] = olddp4; R_ExecuteSetViewSize(); - G_ResetViews(); + G_ResetViews(true); for (i = splitscreen; i >= 0; i--) P_ResetCamera(&players[displayplayers[i]], &camera[i]); diff --git a/src/g_game.c b/src/g_game.c index e65e25b79..4076136cf 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1751,14 +1751,15 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive) // Increment a viewpoint by offset from the current player. A negative value // decrements. // -void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive) +static void G_ActuallyAdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive, boolean resetfreecam) { INT32 *displayplayerp, oldview; displayplayerp = &displayplayers[viewnum-1]; oldview = (*displayplayerp); // turn off the freecam - camera[viewnum-1].freecam = false; + if (resetfreecam) + camera[viewnum-1].freecam = false; G_ResetView(viewnum, ( (*displayplayerp) + offset ), onlyactive); @@ -1767,12 +1768,18 @@ void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive) (*displayplayerp) = oldview; } +// im a lazy ass :chonkbuncle: +void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive) +{ + G_ActuallyAdjustView(viewnum, offset, onlyactive, true); +} + // // G_ResetViews // Ensures all viewpoints are valid // Also demotes splitscreen down to one player. // -void G_ResetViews(void) +void G_ResetViews(boolean resetfreecam) { UINT8 splits; UINT8 viewd; @@ -1796,7 +1803,7 @@ void G_ResetViews(void) */ for (viewd = 1; viewd <= splits; ++viewd) { - G_AdjustView(viewd, 0, false); + G_ActuallyAdjustView(viewd, 0, false, resetfreecam); } } diff --git a/src/g_game.h b/src/g_game.h index c16d02d4a..a8e2b5135 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -262,7 +262,7 @@ boolean G_CanView(INT32 playernum, UINT8 viewnum, boolean onlyactive); INT32 G_FindView(INT32 startview, UINT8 viewnum, boolean onlyactive, boolean reverse); INT32 G_CountPlayersPotentiallyViewable(boolean active); -void G_ResetViews(void); +void G_ResetViews(boolean resetfreecam); void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive); void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive);