stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect newdisplayplayer in forced ViewpointSwitch

Browse source
This commit is contained in:
Jaime Passos 2020-02-23 12:14:52 -03:00
parent 0770f77371
commit 0362f53e9b
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -2513,7 +2513,7 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here. // Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed. // The viewpoint was forcibly changed.
LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], true); LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
#endif #endif
displayplayer = consoleplayer; displayplayer = consoleplayer;
} }

6
src/d_netcmd.c
View file

@ -2843,7 +2843,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
// Call ViewpointSwitch hooks here. // Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed. // The viewpoint was forcibly changed.
if (displayplayer != consoleplayer) // You're already viewing yourself. No big deal. if (displayplayer != consoleplayer) // You're already viewing yourself. No big deal.
LUAh_ViewpointSwitch(&players[playernum], &players[displayplayer], true); LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
#endif #endif
displayplayer = consoleplayer; displayplayer = consoleplayer;
} }
@ -3753,11 +3753,11 @@ static void ExitMove_OnChange(void)
{ {
if (players[i].mo->target && players[i].mo->target->type == MT_SIGN) if (players[i].mo->target && players[i].mo->target->type == MT_SIGN)
P_SetTarget(&players[i].mo->target, NULL); P_SetTarget(&players[i].mo->target, NULL);
if (players[i].pflags & PF_FINISHED) if (players[i].pflags & PF_FINISHED)
P_GiveFinishFlags(&players[i]); P_GiveFinishFlags(&players[i]);
} }
CONS_Printf(M_GetText("Players can now move after completing the level.\n")); CONS_Printf(M_GetText("Players can now move after completing the level.\n"));
} }
else else

2
src/g_game.c
View file

@ -1718,7 +1718,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here. // Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed. // The viewpoint was forcibly changed.
LUAh_ViewpointSwitch(player, &players[displayplayer], true); LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
#endif #endif
displayplayer = consoleplayer; displayplayer = consoleplayer;
} }

6
src/p_user.c
View file

@ -392,7 +392,7 @@ void P_GiveFinishFlags(player_t *player)
mobj_t* flag = P_SpawnMobjFromMobj(player->mo, xoffs, yoffs, 0, MT_FINISHFLAG); mobj_t* flag = P_SpawnMobjFromMobj(player->mo, xoffs, yoffs, 0, MT_FINISHFLAG);
flag->angle = angle; flag->angle = angle;
angle += FixedAngle(120*FRACUNIT); angle += FixedAngle(120*FRACUNIT);
P_SetTarget(&flag->target, player->mo); P_SetTarget(&flag->target, player->mo);
} }
} }
@ -10650,7 +10650,7 @@ boolean P_SpectatorJoinGame(player_t *player)
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here. // Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed. // The viewpoint was forcibly changed.
LUAh_ViewpointSwitch(player, &players[displayplayer], true); LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
#endif #endif
displayplayer = consoleplayer; displayplayer = consoleplayer;
} }
@ -10699,7 +10699,7 @@ boolean P_SpectatorJoinGame(player_t *player)
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here. // Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed. // The viewpoint was forcibly changed.
LUAh_ViewpointSwitch(player, &players[displayplayer], true); LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
#endif #endif
displayplayer = consoleplayer; displayplayer = consoleplayer;
} }