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

Reset viewpoint to local player if last viewed player spectates or leaves

Browse source
This commit is contained in:
James R 2023-02-26 01:57:49 -08:00
parent 0bb6f96a13
commit 9578f5e05d
3 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_clisrv.c
View file

@ -2608,15 +2608,6 @@ void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
LUA_HookPlayerQuit(&players[playernum], reason); // Lua hook for player quitting LUA_HookPlayerQuit(&players[playernum], reason); // Lua hook for player quitting
// don't look through someone's view who isn't there
if (playernum == displayplayers[0] && !demo.playback)
{
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
LUA_HookViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
displayplayers[0] = consoleplayer;
}
G_RemovePartyMember(playernum); G_RemovePartyMember(playernum);
// Reset player data // Reset player data
@ -2636,6 +2627,9 @@ void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
LUA_InvalidatePlayer(&players[playernum]); LUA_InvalidatePlayer(&players[playernum]);
// don't look through someone's view who isn't there
G_ResetViews();
K_CheckBumpers(); K_CheckBumpers();
P_CheckRacers(); P_CheckRacers();
} }

17
src/d_netcmd.c
View file

@ -1589,21 +1589,8 @@ static void FinalisePlaystateChange(INT32 playernum)
K_StripItems(&players[playernum]); K_StripItems(&players[playernum]);
} }
// Reset away view (some code referenced from P_SpectatorJoinGame) // Reset away view
{ G_ResetViews();
UINT8 i = 0;
INT32 *localplayertable = (splitscreen_partied[consoleplayer] ? splitscreen_party[consoleplayer] : g_localplayers);
for (i = 0; i <= r_splitscreen; i++)
{
if (localplayertable[i] == playernum)
{
LUA_HookViewpointSwitch(players+playernum, players+playernum, true);
displayplayers[i] = playernum;
break;
}
}
}
K_CheckBumpers(); // SRB2Kart K_CheckBumpers(); // SRB2Kart
P_CheckRacers(); // also SRB2Kart P_CheckRacers(); // also SRB2Kart

13
src/g_game.c
View file

@ -2035,7 +2035,14 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
/* Check if anyone is available to view. */ /* Check if anyone is available to view. */
if (( playernum = G_FindView(playernum, viewnum, onlyactive, playernum < olddisplayplayer) ) == -1) if (( playernum = G_FindView(playernum, viewnum, onlyactive, playernum < olddisplayplayer) ) == -1)
return; {
/* Fall back on true self */
playernum = g_localplayers[viewnum-1];
}
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
LUA_HookViewpointSwitch(&players[g_localplayers[viewnum - 1]], &players[playernum], true);
/* Focus our target view first so that we don't take its player. */ /* Focus our target view first so that we don't take its player. */
(*displayplayerp) = playernum; (*displayplayerp) = playernum;
@ -2097,8 +2104,8 @@ void G_ResetViews(void)
/* Demote splits */ /* Demote splits */
if (playersviewable < splits) if (playersviewable < splits)
{ {
splits = playersviewable; splits = max(playersviewable, splitscreen + 1); // don't delete local players
r_splitscreen = max(splits-1, 0); r_splitscreen = splits - 1;
R_ExecuteSetViewSize(); R_ExecuteSetViewSize();
} }