From 4885611f47a3b936095594232a912a4330c2ce3a Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 18 Jul 2023 10:20:42 +0100
Subject: [PATCH] Move ACS script loading back to P_DoLoadLevel, since on
 second thought it's just LOADING and not executing anything

---
 src/p_setup.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 4a6d41e73..758c4b425 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -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
 	//  the client's view of the data.)
 	if (!fromnetsave)
+	{
 		P_InitGametype();
 
+		// Initialize ACS scripts
+		ACS_LoadLevelScripts(gamemap-1);
+	}
+
 	// Now safe to free.
 	vres_Free(curmapvirt);
 	curmapvirt = NULL;
@@ -8419,12 +8424,6 @@ void P_PostLoadLevel(void)
 		G_BeginRecording(); // I AM NOW READY TO RECORD.
 	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();
 
 	nextmapoverride = 0;