Disable Loadout and Pistolstart for Hexen

- It's incompatible

Author: andrikpowell

prboom2/src/m_menu.c

@@ -1826,6 +1826,58 @@ static int entry_index;
 static char entry_string_index[ENTRY_STRING_BFR_SIZE]; // points to new strings while editing
 static int choice_value;
 
+/////////////////////////////
+//
+// Custom Skill Functions [based off Nugget]
+
+enum
+{
+  cskill_new_game,
+  cskill_pistol_start,
+  cskill_loadout_current
+} cskill_mode_e;
+
+static void M_StartCustomSkill(int mode)
+{
+  // Use custom skill (-1 to match gameskill)
+  chosen_skill = num_skills - 1;
+
+  dsda_UpdateCustomSkill(chosen_skill);
+
+  if (mode == cskill_new_game || gamestate == GS_DEMOSCREEN)
+    M_FinishGameSelection();
+  else if (mode == cskill_pistol_start || !in_game)
+    G_DeferedInitNew(chosen_skill, gameepisode, gamemap);
+  else if (mode == cskill_loadout_current)
+    G_RestartWithLoadout();
+
+  M_ClearMenus();
+}
+
+static void StartCustomSkill(int mode)
+{
+    M_StartCustomSkill(mode);
+
+    M_LeaveSetupMenu();
+    M_ClearMenus();
+    S_StartVoidSound(g_sfx_swtchx);
+}
+
+static void CSNewGame(void)
+{
+  StartCustomSkill(cskill_new_game);
+}
+
+static void CSPistolStart(void)
+{
+  StartCustomSkill(cskill_pistol_start);
+}
+
+static void CSCurrentLoadout(void)
+{
+  StartCustomSkill(cskill_loadout_current);
+}
+
 /////////////////////////////
 //
 // M_ItemDisabled
@@ -1841,6 +1893,14 @@ static dboolean M_ItemDisabled(const setup_menu_t* s)
   if (dsda_StrictMode() && dsda_IsStrictConfig(s->config_id))
     return true;
 
+  // Hexen Stuff
+  if (hexen)
+  {
+    // Hexen doesn't allow pistolstart + loadout doesn't work due to key management
+    if (s->action == CSPistolStart || s->action == CSCurrentLoadout)
+      return true;
+  }
+
   return false;
 }
 
@@ -3616,58 +3676,6 @@ static void M_DrawCompatibility(void)
   M_DrawScreenItems(current_setup_menu, DEFAULT_LIST_Y);
 }
 
-/////////////////////////////
-//
-// Custom Skill Functions [based off Nugget]
-
-enum
-{
-  cskill_new_game,
-  cskill_pistol_start,
-  cskill_loadout_current
-} cskill_mode_e;
-
-static void M_StartCustomSkill(int mode)
-{
-  // Use custom skill (-1 to match gameskill)
-  chosen_skill = num_skills - 1;
-
-  dsda_UpdateCustomSkill(chosen_skill);
-
-  if (mode == cskill_new_game || gamestate == GS_DEMOSCREEN)
-    M_FinishGameSelection();
-  else if (mode == cskill_pistol_start || !in_game)
-    G_DeferedInitNew(chosen_skill, gameepisode, gamemap);
-  else if (mode == cskill_loadout_current)
-    G_RestartWithLoadout();
-
-  M_ClearMenus();
-}
-
-static void StartCustomSkill(int mode)
-{
-    M_StartCustomSkill(mode);
-
-    M_LeaveSetupMenu();
-    M_ClearMenus();
-    S_StartVoidSound(g_sfx_swtchx);
-}
-
-static void CSNewGame(void)
-{
-  StartCustomSkill(cskill_new_game);
-}
-
-static void CSPistolStart(void)
-{
-  StartCustomSkill(cskill_pistol_start);
-}
-
-static void CSCurrentLoadout(void)
-{
-  StartCustomSkill(cskill_loadout_current);
-}
-
 
 /////////////////////////////
 //
@@ -5092,6 +5100,9 @@ static dboolean M_SetupCommonSelectResponder(int ch, int action, event_t* ev)
   if (ptr1->m_flags & S_FUNC)
   {
     if (action == MENU_ENTER) {
+      if (M_ItemDisabled(ptr1))
+        return true;
+
       if (ptr1->action)
         ptr1->action();