Separate content switching code to func for future

IonAgorria · Sep 18, 2023 · 4c283f3 · 4c283f3
1 parent e326942
commit 4c283f3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/Source/UserInterface/MainMenu.cpp b/Source/UserInterface/MainMenu.cpp
@@ -1866,6 +1866,25 @@ void onMMInMissQuitButton(CShellWindow* pWnd, InterfaceEventCode code, int param
 	}		
 }
 
+//game content
+
+//TODO call this from load/ingame-load/replay menus to enable auto switching (provide initial_menu to current menu ID)
+void switchGameContent(GAME_CONTENT selected, const std::string& initial_menu) {
+	if (selected == terGameContentBase) {
+		selected = terGameContentAvailable;
+	}
+	if (selected == terGameContentSelect) {
+		//Selected the already selected content, no need to restart
+		_shellIconManager.SwitchMenuScreens( SQSH_MM_CONTENT_CHOOSER_SCR, SQSH_MM_SINGLE_SCR );
+	} else {
+		//Set args and restart
+		std::vector<std::string> args;
+		args.emplace_back("tmp_initial_menu=" + initial_menu);
+		args.emplace_back("tmp_content_select=" + getGameContentEnumName(selected));
+		request_application_restart(&args);
+		_shellIconManager.SwitchMenuScreens( SQSH_MM_CONTENT_CHOOSER_SCR, RESTART_GAME );
+	}
+}
 
 //load game
 int delLoadSaveAction(float, float) {
@@ -1884,15 +1903,18 @@ bool setupMissionToExec(int pos) {
         return false;
     }
     checkMissionDescription(pos, savedGames, GT_SINGLE_PLAYER);
-    missionToExec = savedGames[pos];
+
+	MissionDescription& desc = savedGames[pos];
 
     //Check if content is compatible
-    std::string missingContent = checkMissingContent(missionToExec);
+    std::string missingContent = checkMissingContent(desc);
     if (!missingContent.empty()) {
         setupOkMessageBox(nullptr, 0, missingContent, MBOX_BACK);
         showMessageBox();
         return false;
     }
+
+	missionToExec = desc;
 
     //Setup according to mission type
     if (missionToExec.missionNumber == -1) {

diff --git a/Source/UserInterface/MainMenu.h b/Source/UserInterface/MainMenu.h
@@ -7,6 +7,8 @@ const char* getMapName(const char* keyStr);
 
 void loadMapVector(std::vector<MissionDescription>& mapVector, const std::string& path, const std::string& mask, bool replay = false);
 
+void switchGameContent(GAME_CONTENT selected, const std::string& initial_menu);
+
 void checkMissionDescription(int index, std::vector<MissionDescription>& mVect, GameType gameType);
 
 std::string checkMissingContent(const MissionDescription& mission);

diff --git a/Source/UserInterface/Menu/SingleMenu.cpp b/Source/UserInterface/Menu/SingleMenu.cpp
@@ -176,21 +176,7 @@ void selectedContentChooser() {
     int pos = list->GetCurSel();
     std::vector<GAME_CONTENT> contents = getGameContentEnums(terGameContentAvailable);
     if (0 <= pos && pos < contents.size()) {
-        GAME_CONTENT selected = contents[pos];
-        if (selected == terGameContentBase) {
-            selected = terGameContentAvailable;
-        }
-        if (selected == terGameContentSelect) {
-            //Selected the already selected content, no need to restart
-            _shellIconManager.SwitchMenuScreens( SQSH_MM_CONTENT_CHOOSER_SCR, SQSH_MM_SINGLE_SCR );
-        } else {
-            //Set args and restart
-            std::vector<std::string> args;
-            args.emplace_back("tmp_initial_menu=SINGLE");
-            args.emplace_back(std::string("tmp_content_select=") + getGameContentEnumName(selected));
-            request_application_restart(&args);
-            _shellIconManager.SwitchMenuScreens( SQSH_MM_CONTENT_CHOOSER_SCR, RESTART_GAME );
-        }
+        switchGameContent(contents[pos], "SINGLE");
     }
 }