Remove native fullscreen mode related methods (followup to cb7476a)

Author: MaximDude

GUI/AllegroInput.cpp

@@ -37,7 +37,7 @@ AllegroInput::AllegroInput(int whichPlayer, bool keyJoyMouseCursor):
     // Set the speed of the mouse
     float mouseDenominator = g_FrameMan.ResolutionMultiplier();
     // If Nx fullscreen, adjust the mouse speed accordingly
-    if (g_FrameMan.IsFullscreen() && mouseDenominator > 1)
+    if (mouseDenominator > 1)
         set_mouse_speed(1, 1);
     else
         set_mouse_speed(2, 2);

Managers/FrameMan.cpp

@@ -130,7 +130,6 @@ namespace RTE {
 				m_ResMultiplier = m_NewResMultiplier = 1;
 			}
 		}
-		if (resX * m_ResMultiplier == m_ScreenResX && resY * m_ResMultiplier == m_ScreenResY) { m_Fullscreen = true; }
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -306,97 +305,6 @@ namespace RTE {
 		g_PrimitiveMan.ClearPrimitivesList();
 	}
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	int FrameMan::ToggleFullscreen() {
-		// Save the palette so we can re-set it after the change
-		PALETTE pal;
-		get_palette(pal);
-
-		// Refuse windowed multiplier if the resolution is too high
-		if (m_ResX > 1024) { m_NxWindowed = 1; }
-
-		// Need to save these first for recovery attempts to work (screen might be 0)
-		int resX = m_ResX;
-		int resY = m_ResY;
-
-		int fullscreenGfxDriver = GFX_AUTODETECT_FULLSCREEN;
-		int windowedGfxDriver = GFX_AUTODETECT_WINDOWED;
-
-		fullscreenGfxDriver = GFX_DIRECTX_ACCEL;
-
-		if (g_SettingsMan.ForceSoftwareGfxDriver()) { fullscreenGfxDriver = GFX_DIRECTX_SOFT; }
-		if (g_SettingsMan.ForceSafeGfxDriver()) { fullscreenGfxDriver = GFX_DIRECTX_SAFE; }
-		if (g_SettingsMan.ForceOverlayedWindowGfxDriver()) { windowedGfxDriver = GFX_DIRECTX_OVL; }
-		if (g_SettingsMan.ForceNonOverlayedWindowGfxDriver()) { windowedGfxDriver = GFX_DIRECTX_WIN; }
-		if (g_SettingsMan.ForceVirtualFullScreenGfxDriver()) { windowedGfxDriver = GFX_DIRECTX_WIN_BORDERLESS; }
-
-		// Switch to windowed mode
-		if (m_Fullscreen) {
-			if (set_gfx_mode(windowedGfxDriver, resX * m_NxWindowed, resY * m_NxWindowed, 0, 0) != 0) {
-				// Oops, failed to set windowed mode, so go back to fullscreen
-				if (set_gfx_mode(fullscreenGfxDriver, resX * m_NxFullscreen, resY * m_NxFullscreen, 0, 0) != 0) {
-					// Can't go back to fullscreen either! total fail
-					set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-					allegro_message("Unable to set back to fullscreen mode because: %s!", allegro_error);
-					return 1;
-				}
-				// Successfully reverted back to fullscreen
-				g_ConsoleMan.PrintString("ERROR: Failed to switch to windowed mode, reverted back to fullscreen!");
-				m_Fullscreen = true;
-				// Reset the palette.
-				set_palette(pal);
-				// Make sure everything gets caught up after the switch
-				rest(2000);
-				return 1;
-			}
-			// Make sure everything gets caught up after the switch
-			rest(2000);
-			g_ConsoleMan.PrintString("SYSTEM: Switched to windowed mode");
-			m_Fullscreen = false;			
-		} else {
-			// Switch to fullscreen
-			if (set_gfx_mode(fullscreenGfxDriver, resX * m_NxFullscreen, resY * m_NxFullscreen, 0, 0) != 0) {
-				// Oops, failed to set fullscreen mode, try a different fullscreen scaling
-				m_NewNxFullscreen = m_NxFullscreen = m_NxFullscreen == 1 ? 2 : 1;
-				if (set_gfx_mode(fullscreenGfxDriver, resX * m_NxFullscreen, resY * m_NxFullscreen, 0, 0) != 0) {
-					// That didn't work either, so go back to windowed
-					allegro_message("Unable enter fullscreen mode because: %s!\n\nWill try to revert to windowed mode now...", allegro_error);
-					if (set_gfx_mode(windowedGfxDriver, resX * m_NxWindowed, resY * m_NxWindowed, 0, 0) != 0) {
-						// Can't go back to windowed either! total fail
-						set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-						allegro_message("Unable to set back to windowed mode because: %s!", allegro_error);
-						return 1;
-					}
-					// Successfully reverted back to windowed
-					g_ConsoleMan.PrintString("ERROR: Failed to switch to fullscreen mode, reverted back to windowed!");
-					m_Fullscreen = false;
-					// Make sure everything gets caught up after the switch
-					rest(1500);
-					// Reset the palette.
-					set_palette(pal);
-					return 1;
-				}
-			}
-			// Make sure everything gets caught up after the switch
-			rest(1500);
-			g_ConsoleMan.PrintString("SYSTEM: Switched to fullscreen mode");
-			m_Fullscreen = true;
-		}
-		// Reset the palette.
-		set_palette(pal);
-
-		// Adjust the speed of the mouse according to 2x of screen
-		float mouseDenominator = IsFullscreen() ? NxFullscreen() : NxWindowed();
-		set_mouse_range(0, 0, (GetResX() * mouseDenominator) - 3, (GetResY() * mouseDenominator) - 3);
-
-		// If NxFullscreen, adjust the mouse speed accordingly
-		unsigned char mouseSpeedMultiplier = (g_FrameMan.IsFullscreen() && g_FrameMan.NxFullscreen() > 1) ? 1 : 2;
-		set_mouse_speed(mouseSpeedMultiplier, mouseSpeedMultiplier);
-
-		return 0;
-	}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	bool FrameMan::IsValidResolution(int width, int height) const {

Managers/FrameMan.h

@@ -131,18 +131,6 @@ namespace RTE {
 #pragma endregion
 
 #pragma region Resolution Handling
-		/// <summary>
-		/// Indicates whether we're in fullscreen mode or not.
-		/// </summary>
-		/// <returns>Whether we're in fullscreen mode.</returns>
-		bool IsFullscreen() const { return m_Fullscreen; }
-
-		/// <summary>
-		/// Toggles to and from fullscreen and windowed mode.
-		/// </summary>
-		/// <returns>Error code, anything other than 0 is error.</returns>
-		int ToggleFullscreen();
-
 		/// <summary>
 		/// Gets the horizontal resolution of the screen.
 		/// </summary>

Managers/UInputMan.cpp

@@ -2793,11 +2793,6 @@ int UInputMan::Update()
             g_ConsoleMan.PrintString("SYSTEM: Activity was reset!");
     }
 
-    // Toggle fullscreen / windowed
-    if (key_shifts & KB_ALT_FLAG && KeyPressed(KEY_ENTER)) {
-        g_FrameMan.ToggleFullscreen();
-    }
-
     // Only allow performance tweaking if showing the stats
     if (g_PerformanceMan.IsShowingPerformanceStats())
     {