Simplify code in MenuNewGame()

Author: winterheart

Descent3/Mission.cpp

@@ -879,7 +879,7 @@ bool DemoMission(int mode = 0) {
 }
 #endif
 
-bool LoadMission(const char *mssn) {
+bool LoadMission(const std::filesystem::path& mssn) {
   Times_game_restored = 0;
   LOG_INFO << "In LoadMission()";
 #if (defined(OEM) || defined(DEMO))
@@ -919,7 +919,7 @@ bool LoadMission(const char *mssn) {
   // Open MN3 if filename passed was a mn3 file.
   if (IS_MN3_FILE(mssn)) {
     mission = mssn;
-    pathname = std::filesystem::path("missions") / mission;
+    pathname = "missions" / mission;
   } else {
     mission = mssn;
     pathname = mssn;

Descent3/Mission.h

@@ -298,7 +298,7 @@ void InitMission();
 void ResetMission();
 
 //	loads and verifies a mission as the current mission, returns if valid of not.
-bool LoadMission(const char *msn);
+bool LoadMission(const std::filesystem::path& mssn);
 
 //	initializes a level's script.
 void InitLevelScript();

Descent3/menu.cpp

@@ -1107,53 +1107,31 @@ bool MenuNewGame() {
   int n_missions, res;
   bool found = false;
   bool retval = true;
+  std::filesystem::path mission_name;
+
 #ifdef DEMO
-  if (LoadMission("d3demo.mn3")) {
-    CurrentPilotUpdateMissionStatus(true);
-    // go into game mode.
-    SetGameMode(GM_NORMAL);
-    SetFunctionMode(GAME_MODE);
-    return true;
-  } else {
-    DoMessageBox(TXT_ERROR, TXT_ERRLOADMSN, MSGBOX_OK);
-    return false;
-  }
+  mission_name = "d3demo.mn3";
 #else
   if (int mission_arg = FindArg("-mission")) {
-    std::filesystem::path filename = std::filesystem::path(GameArgs[mission_arg + 1]).filename().replace_extension(".mn3");
-    if (LoadMission(filename.u8string().c_str())) {
-      CurrentPilotUpdateMissionStatus(true);
-      // go into game mode.
-      SetGameMode(GM_NORMAL);
-      SetFunctionMode(GAME_MODE);
-      return true;
-    } else {
-      DoMessageBox(TXT_ERROR, TXT_ERRLOADMSN, MSGBOX_OK);
-      return false;
-    }
-  }
-  if ((!FirstGame) && (-1 == Current_pilot.find_mission_data(TRAINING_MISSION_NAME))) {
-
+    // If direct loading via cmdline option
+    mission_name = std::filesystem::path(GameArgs[mission_arg + 1]).filename().replace_extension(".mn3");
+  } else if ((!FirstGame) && (-1 == Current_pilot.find_mission_data(TRAINING_MISSION_NAME))) {
+    // First time?
     FirstGame = true;
-
-    if (LoadMission("training.mn3")) {
-      CurrentPilotUpdateMissionStatus(true);
-      // go into game mode.
-      SetGameMode(GM_NORMAL);
-      SetFunctionMode(GAME_MODE);
-      return true;
-    } else {
-      DoMessageBox(TXT_ERROR, TXT_ERRLOADMSN, MSGBOX_OK);
-      return false;
-    }
+    mission_name = "training.mn3";
   } else if (FirstGame) {
+    // Already trained
     FirstGame = false;
 #ifdef OEM
-    if (LoadMission(OEM_MISSION_FILE))
+    mission_name = OEM_MISSION_FILE;
 #else
-    if (LoadMission("d3.mn3"))
-#endif
-    {
+    mission_name = "d3.mn3";
+#endif // OEM
+  }
+#endif // DEMO
+
+  if (!mission_name.empty()) {
+    if (LoadMission(mission_name)) {
       CurrentPilotUpdateMissionStatus(true);
       // go into game mode.
       SetGameMode(GM_NORMAL);
@@ -1291,7 +1269,6 @@ bool MenuNewGame() {
   menu.Destroy();
 
   return retval;
-#endif // DEMO
 }
 
 // DisplayLevelWarpDlg