Remove unused code. Fix OOB menu access.

doomhack · Jan 2, 2020 · c18a965 · c18a965
1 parent 54a7f5a
commit c18a965
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/include/m_menu.h b/include/m_menu.h
@@ -67,8 +67,6 @@ void M_Init (void);
 
 void M_StartControlPanel (void);
 
-void M_ForcedLoadGame(const char *msg); // killough 5/15/98: forced loadgames
-
 void M_ResetMenu(void);      // killough 11/98: reset main menu ordering
 
 void M_DrawCredits(void);    // killough 11/98

diff --git a/source/m_menu.c b/source/m_menu.c
@@ -281,6 +281,7 @@ void M_Episode(int choice)
   if ( (_g->gamemode == shareware) && choice)
   {
     M_StartMessage(SWSTRING,NULL,false); // Ty 03/27/98 - externalized
+    M_ClearMenus();
     return;
   }
 
@@ -440,23 +441,6 @@ void M_LoadSelect(int choice)
   M_ClearMenus ();
 }
 
-//
-// killough 5/15/98: add forced loadgames
-//
-
-static void M_VerifyForcedLoadGame(int ch)
-{
-  if (ch=='y')
-    G_ForcedLoadGame();
-  free(_g->messageString);       // free the message strdup()'ed below
-  M_ClearMenus();
-}
-
-void M_ForcedLoadGame(const char *msg)
-{
-  M_StartMessage(strdup(msg), M_VerifyForcedLoadGame, true); // free()'d above
-}
-
 //
 // Selected from DOOM menu
 //