stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-08 01:02:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

EndTextPrompt: Fix tmthing crash with P_LinedefExecute

Browse source
This commit is contained in:
mazmazz 2018-11-03 15:07:02 -04:00
parent 57d9e0aef6
commit 98d532f119
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/f_finale.c
View file

@ -2072,11 +2072,15 @@ void F_EndTextPrompt(void)
// \todo net safety, maybe loop all player thinkers? // \todo net safety, maybe loop all player thinkers?
if (promptpostexectag) if (promptpostexectag)
{
P_MapStart();
P_LinedefExecute(promptpostexectag, promptmo, NULL); P_LinedefExecute(promptpostexectag, promptmo, NULL);
P_MapEnd();
}
// \todo reset blocked controls and frozen realtime? // \todo reset frozen realtime?
P_SetTarget(&promptmo, NULL); // \todo tmthing crash upon teleporting? see test map P_SetTarget(&promptmo, NULL);
// \todo if !promptactive, block player jumping if BT_JUMP is set // \todo if !promptactive, block player jumping if BT_JUMP is set
// so player does not immediately jump upon prompt close // so player does not immediately jump upon prompt close
@ -2093,7 +2097,7 @@ void F_StartTextPrompt(INT32 promptnum, INT32 pagenum, mobj_t *mo, UINT16 postex
skullAnimCounter = 0; skullAnimCounter = 0;
// Set up state // Set up state
P_SetTarget(&promptmo, mo); //promptmo = mo; P_SetTarget(&promptmo, mo);
promptpostexectag = postexectag; promptpostexectag = postexectag;
promptblockcontrols = blockcontrols; promptblockcontrols = blockcontrols;
(void)freezerealtime; // \todo freeze player->realtime, maybe this needs to cycle through player thinkers (void)freezerealtime; // \todo freeze player->realtime, maybe this needs to cycle through player thinkers