vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/james/netreplays-resetview-sigsegv-fix' into new_netreplays

This commit is contained in:
fickleheart 2019-03-19 23:44:22 -05:00
parent 29c6dae776 a858967762
commit f6797e285b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/g_game.c
View File

@ -2257,10 +2257,13 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
R_ExecuteSetViewSize();
}
/* Check if anyone is available to view. */
if (( playernum = G_FindView(playernum, viewnum, onlyactive) ) == -1)
return;
/* Focus our target view first so that we don't take its player. */
displayplayerp = (G_GetDisplayplayerPtr(viewnum));
olddisplayplayer = (*displayplayerp);
(*displayplayerp) = G_FindView(playernum, viewnum, onlyactive);
(*displayplayerp) = playernum;
if ((*displayplayerp) != olddisplayplayer)
{
camerap = (P_GetCameraPtr(viewnum));