Move ACS script loading back to P_DoLoadLevel, since on second thought it's just LOADING and not executing anything

This commit is contained in:
toaster 2023-07-18 10:20:42 +01:00
parent 859b3fa350
commit 4885611f47

View file

@ -8304,8 +8304,13 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// a netgame save is being loaded, and could actively be harmful by messing with // a netgame save is being loaded, and could actively be harmful by messing with
// the client's view of the data.) // the client's view of the data.)
if (!fromnetsave) if (!fromnetsave)
{
P_InitGametype(); P_InitGametype();
// Initialize ACS scripts
ACS_LoadLevelScripts(gamemap-1);
}
// Now safe to free. // Now safe to free.
vres_Free(curmapvirt); vres_Free(curmapvirt);
curmapvirt = NULL; curmapvirt = NULL;
@ -8419,12 +8424,6 @@ void P_PostLoadLevel(void)
G_BeginRecording(); // I AM NOW READY TO RECORD. G_BeginRecording(); // I AM NOW READY TO RECORD.
demo.deferstart = true; demo.deferstart = true;
// Initialize ACS scripts
//if (!fromnetsave) -- I don't know if it's appropriate to remove this entirely yet
{
ACS_LoadLevelScripts(gamemap-1);
}
K_TimerInit(); K_TimerInit();
nextmapoverride = 0; nextmapoverride = 0;