Hexen: sideloading optimization & bugfixing (#1403)

* Hexen: tryout changing the S_InitScript and InitMapInfo

* Revert "Hexen: tryout changing the S_InitScript and InitMapInfo"

This reverts commit 8fa0992.

* Hexen: Fix bug with wrong demo reel when in episode selection

* Hexen: only reinit episode in case it is changed

* Hexen: chose different way how to detect HEXDD.WAD

.. and move the check back after W_GenerateHashTable.

* Hexen: smaller adaptions for end game while sideloading

Author: Noseey

src/hexen/d_pwad.c

@@ -36,15 +36,13 @@ static boolean CheckHEXDDLoaded (void)
 {
 	int i, j;
 
-	i = P_TranslateMap(1);
-	j = P_TranslateMap(20);
-
-	// Check if HEXDD.WAD is already loaded by checking MapInfo Mapnames for warptarget 1 and 20
-	if (i >= 0 && j >= 0 &&
-		!strcasecmp(P_GetMapName(i), "RUINED VILLAGE") &&
-	    !strcasecmp(P_GetMapName(j), "DARK CITADEL"))
+	// Check if HEXDD.WAD is already loaded
+	if ((i = W_CheckNumForName("MAP41")) != -1 &&
+	    (j = W_CheckNumForName("MAP60")) != -1 &&
+	    !strcasecmp(W_WadNameForLump(lumpinfo[i]), "HEXDD.WAD") &&
+	    !strcasecmp(W_WadNameForLump(lumpinfo[j]), "HEXDD.WAD"))
 	{
-		gameepisode = 2;
+		gameepisode = prev_episode = 2;
 		return true;
 	}
 
@@ -134,13 +132,13 @@ static void CheckLoadHEXDD (void)
         }
     }
 
-	// [crispy] load WAD and DEH files from autoload directories
+	// [crispy] load WAD from autoload directories
 	if (!M_ParmExists("-noautoload"))
 	{
 		if ((autoload_dir = M_GetAutoloadDir(dd_basename, false)))
 		{
 			W_AutoLoadWADsRename(autoload_dir, hexdd_lumps, arrlen(hexdd_lumps));
-			//DEH_AutoLoadPatches(autoload_dir);
+			// TODO? DEH_AutoLoadPatches(autoload_dir);
 			free(autoload_dir);
 		}
 	}

src/hexen/g_game.c

@@ -39,6 +39,7 @@
 // External functions
 
 extern void R_ExecuteSetViewSize(void); // [crispy] for clean screenshot
+extern void S_InitScript(void); // [crispy] multiple episodes
 
 // Functions
 
@@ -69,6 +70,7 @@ gameaction_t gameaction;
 gamestate_t gamestate;
 skill_t gameskill;
 //boolean         respawnmonsters;
+int prev_episode;               // [crispy] previous episode up until InitEpisode
 int gameepisode;
 int gamemap;
 int prevmap;
@@ -1918,6 +1920,8 @@ void G_StartNewGame(skill_t skill)
     int realMap;
 
     G_StartNewInit();
+    // [crispy] re-init scripts and mapinfo to support multiple episodes
+    H2_InitEpisode(false);
     realMap = P_TranslateMap(1);
     if (realMap == -1)
     {
@@ -2282,7 +2286,8 @@ void G_InitNew(skill_t skill, int episode, int map)
     }
     paused = false;
     viewactive = true;
-    gameepisode = episode;
+    // [crispy] don't let e. g. demo episode overwrite gameepisode
+    // gameepisode = episode;
     gamemap = map;
     gameskill = skill;
     BorderNeedRefresh = true;
@@ -2728,3 +2733,34 @@ boolean G_CheckDemoStatus(void)
 
     return false;
 }
+
+/*
+===============================================================================
+
+						[crispy] Additional Functions
+
+===============================================================================
+*/
+
+/*
+===================
+=
+= H2_InitEpisode
+=
+= (Re-)Init episode related MapInfo and Sound Scripts
+= to support multiple episodes in Hexen.
+===================
+*/
+
+void H2_InitEpisode(bool forceinit)
+{
+    if (!crispy->havedeathkings)
+        return;
+
+    if (forceinit || (prev_episode != gameepisode))
+    {
+        S_InitScript();
+        InitMapInfo();
+        prev_episode = gameepisode;
+    }
+}

src/hexen/h2_main.c

@@ -484,6 +484,7 @@ void D_DoomMain(void)
 
     I_AtExit(D_HexenQuitMessage, false);
     startepisode = 1;
+    gameepisode = prev_episode = startepisode; // [crispy] init gameepisode
     autostart = false;
     startmap = 1;
     gamemode = commercial;

src/hexen/h2def.h

@@ -677,6 +677,7 @@ extern int Sky2Texture;
 extern gamestate_t gamestate;
 extern skill_t gameskill;
 //extern        boolean         respawnmonsters;
+extern int prev_episode;        // [crispy]
 extern int gameepisode;
 extern int gamemap;
 extern int prevmap;
@@ -755,6 +756,7 @@ void H2_GameLoop(void);
 
 void H2_StartTitle(void);
 
+void H2_InitEpisode(bool forceinit); // [crispy]
 
 extern boolean artiskip;
 

src/hexen/mn_menu.c

@@ -114,7 +114,6 @@ extern void I_ReInitGraphics(int reinit); // [crispy]
 extern void R_ExecuteSetViewSize(void); // [crispy]
 extern void AM_LevelInit(boolean reinit); // [crispy]
 extern void AM_initVariables(void); // [crispy]
-extern void S_InitScript(void); // [crispy]
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
 
@@ -1579,12 +1578,9 @@ static void SCEpisode(int option)
         demoextend = false;
     }
 
-    // Execude Episode Selection
+    // [crispy] Execude Episode Selection
+    prev_episode = gameepisode;
     gameepisode = option;
-
-    S_InitScript();
-    InitMapInfo();
-    
     SetMenu(MENU_CLASS);
 }
 
@@ -2320,12 +2316,11 @@ boolean MN_Responder(event_t * event)
                     I_SetPalette(0);
 #endif
                     H2_StartTitle();    // go to intro/demo mode.
-                    // [crispy] re-init episode 1 for correct demo reel
-                    if (gameepisode > 1)
+                    // [crispy] re-init startepisode for correct demo reel
+                    if (crispy->havedeathkings && gameepisode != startepisode)
                     {
-                        gameepisode = 1;
-                        S_InitScript();
-                        InitMapInfo();
+                        gameepisode = prev_episode = startepisode;
+                        H2_InitEpisode(true);
                     }
                     return false;
                 case 3:

src/hexen/sv_save.c

@@ -89,7 +89,6 @@ typedef struct
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
-extern void S_InitScript(void); // [crispy] support multiple episodes
 void P_SpawnPlayer(mapthing_t * mthing);
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@@ -2129,6 +2128,7 @@ void SV_LoadGame(int slot)
 
     AssertSegment(ASEG_GAME_HEADER);
 
+    prev_episode = gameepisode; // [crispy]
     gameepisode = 1;
     gamemap = SV_ReadByte();
     gameskill = SV_ReadByte();
@@ -2154,8 +2154,7 @@ void SV_LoadGame(int slot)
     SV_ReadExtendedSaveGameData(EXTSAVEG_GAME);
 
     // [crispy] re-init scripts and mapinfo to support multiple episodes
-    S_InitScript();
-    InitMapInfo();
+    H2_InitEpisode(false);
 
     // Save player structs
     for (i = 0; i < maxplayers; i++)