Stopped game freezing after activity end

Author: Causeless

Source/Main.cpp

@@ -245,6 +245,7 @@ void PollSDLEvents() {
 /// Game menus loop.
 /// </summary>
 void RunMenuLoop() {
+	g_MenuMan.SetIsInMenuScreen(true);
 	g_UInputMan.DisableKeys(false);
 	g_UInputMan.TrapMousePos(false);
 
@@ -282,6 +283,8 @@ void RunMenuLoop() {
 		g_WindowMan.GetScreenBuffer()->End();
 		g_WindowMan.UploadFrame();
 	}
+
+	g_MenuMan.SetIsInMenuScreen(false);
 }
 
 /// <summary>

Source/Managers/MenuMan.cpp

@@ -29,6 +29,7 @@ void MenuMan::Initialize(bool firstTimeInit) {
 	m_GUIInput = std::make_unique<GUIInputWrapper>(-1, g_UInputMan.GetJoystickCount() > 0);
 
 	if (firstTimeInit) {
+		m_IsInMenuScreen = false;
 		g_LoadingScreen.Create(m_GUIScreen.get(), m_GUIInput.get(), g_SettingsMan.GetLoadingScreenProgressReportDisabled());
 	}
 
@@ -129,12 +130,6 @@ void MenuMan::HandleTransitionIntoMenuLoop() {
 }
 
 bool MenuMan::Update() {
-	// If we're in the menu but the activity isn't set as paused, then exit
-	// This can mismatch sometimes like when loading a saved game
-	if (m_ActiveMenu != ActiveMenu::MenusDisabled && !g_ActivityMan.ActivityPaused()) {
-		return true;
-	}
-
 	m_TitleScreen->Update();
 	SetActiveMenu();
 

Source/Managers/MenuMan.h

@@ -44,6 +44,16 @@ namespace RTE {
 		void Draw() const;
 #pragma endregion
 
+#pragma region Getters/Setters
+		/// Checks if we're currently in a menu screen.
+		/// @return True if in a menu screen; false otherwise.
+		bool GetIsInMenuScreen() const { return m_IsInMenuScreen; }
+
+		/// Sets if we're currently in a menu screen.
+		/// @param isInMenuScreen Whether we're in any menu screen.
+		void SetIsInMenuScreen(bool isInMenuScreen) { m_IsInMenuScreen = isInMenuScreen; }
+#pragma endregion
+
 	private:
 		/// Enumeration for the different menu screens that are active based on transition states.
 		enum ActiveMenu {
@@ -54,6 +64,7 @@ namespace RTE {
 			PauseMenuActive,
 		};
 
+		bool m_IsInMenuScreen; //!< Whether we're currently in a menu screen.
 		ActiveMenu m_ActiveMenu; //!< The currently active menu screen that is being updated and drawn. See ActiveMenu enumeration.
 
 		std::unique_ptr<GUIInputWrapper> m_GUIInput; //!< The GUIInput interface of this MenuMan.

Source/Managers/UInputMan.cpp

@@ -8,6 +8,7 @@
 #include "ConsoleMan.h"
 #include "PresetMan.h"
 #include "PerformanceMan.h"
+#include "MenuMan.h"
 #include "Icon.h"
 #include "GameActivity.h"
 #include "System.h"
@@ -1177,7 +1178,7 @@ void UInputMan::UpdateMouseInput() {
 		// The mouse cursor is visible and can move about the screen/window, but it should still be contained within the mouse player's part of the window
 		for (int player = PlayerOne; player < MaxPlayerCount; player++) {
 			if (m_ControlScheme[player].GetDevice() == InputDevice::DEVICE_MOUSE_KEYB) {
-				ForceMouseWithinPlayerScreen(g_ActivityMan.IsInActivity(), player);
+				ForceMouseWithinPlayerScreen(g_ActivityMan.IsInActivity() && !g_MenuMan.GetIsInMenuScreen(), player);
 			}
 		}
 	}