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

Run this block of code earlier

Browse source
This commit is contained in:
Lactozilla 2024-01-13 23:53:20 -03:00
parent d6ae1fcd31
commit d77e346bd6
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/p_tick.c
View file

@ -756,6 +756,23 @@ void P_Ticker(boolean run)
ps_lua_mobjhooks.value.i = 0;
ps_checkposition_calls.value.i = 0;
// Reassign the globaltextprompt player if they either quit, or became a spectator
if (globaltextprompt)
{
player_t *promptplayer = globaltextprompt->player;
if (!promptplayer || !playeringame[promptplayer-players] || promptplayer->spectator || promptplayer->quittime)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !(players[i].spectator || players[i].quittime))
{
globaltextprompt->player = &players[i];
break;
}
}
}
}
PS_START_TIMING(ps_lua_prethinkframe_time);
LUA_HookPreThinkFrame();
PS_STOP_TIMING(ps_lua_prethinkframe_time);
@ -792,24 +809,6 @@ void P_Ticker(boolean run)
P_PlayerAfterThink(&players[i]);
// Run text prompts
if (globaltextprompt)
{
player_t *promptplayer = globaltextprompt->player;
// Reassign the player if they either quit, or became a spectator
if (!promptplayer || promptplayer->spectator || promptplayer->quittime || !playeringame[promptplayer-players])
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !(players[i].spectator || players[i].quittime))
{
globaltextprompt->player = &players[i];
break;
}
}
}
}
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
P_RunDialog(&players[i]);