Switch to using a single resolution multiplier property

Author: MaximDude

GUI/AllegroInput.cpp

@@ -35,9 +35,9 @@ AllegroInput::AllegroInput(int whichPlayer, bool keyJoyMouseCursor):
 
 #ifndef GUI_STANDALONE
     // Set the speed of the mouse
-    float mouseDenominator = g_FrameMan.IsFullscreen() ? g_FrameMan.NxFullscreen() : g_FrameMan.NxWindowed();
+    float mouseDenominator = g_FrameMan.ResolutionMultiplier();
     // If Nx fullscreen, adjust the mouse speed accordingly
-    if (g_FrameMan.IsFullscreen() && g_FrameMan.NxFullscreen() > 1)
+    if (g_FrameMan.IsFullscreen() && mouseDenominator > 1)
         set_mouse_speed(1, 1);
     else
         set_mouse_speed(2, 2);
@@ -283,7 +283,7 @@ void AllegroInput::Update(void)
 */
 #ifndef GUI_STANDALONE
     // Get mouse cursor movement denominator based on window size multiplication
-    float mouseDenominator = g_FrameMan.IsFullscreen() ? g_FrameMan.NxFullscreen() : g_FrameMan.NxWindowed();
+    float mouseDenominator = g_FrameMan.ResolutionMultiplier();
 
     // If joysticks and keyboard can control the mouse cursor too
     if (m_KeyJoyMouseCursor)

Managers/FrameMan.cpp

@@ -44,9 +44,7 @@ namespace RTE {
 		m_NewResX = m_ResX;
 		m_NewResY = m_ResY;
 		m_Fullscreen = false;
-		m_NxWindowed = 1;
-		m_NxFullscreen = 1;
-		m_NewNxFullscreen = 1;
+		m_ResMultiplier = 1;
 		m_HSplit = false;
 		m_VSplit = false;
 		m_HSplitOverride = false;
@@ -220,11 +218,8 @@ namespace RTE {
 			m_NewResY = m_ResY;
 		} else if (propName == "Fullscreen") {
 			reader >> m_Fullscreen;
-		} else if (propName == "NxWindowed") {
-			reader >> m_NxWindowed;
-		} else if (propName == "NxFullscreen") {
-			reader >> m_NxFullscreen;
-			m_NewNxFullscreen = m_NxFullscreen;
+		} else if (propName == "ResolutionMultiplier") {
+			reader >> m_ResMultiplier;
 		} else if (propName == "HSplitScreen") {
 			reader >> m_HSplitOverride;
 		} else if (propName == "VSplitScreen") {
@@ -569,7 +564,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void FrameMan::FlipFrameBuffers() {
-		if ((!m_Fullscreen && m_NxWindowed != 1) || (m_Fullscreen && m_NxFullscreen != 1)) {
+		if (m_ResMultiplier > 1) {
 			stretch_blit(m_BackBuffer32, screen, 0, 0, m_BackBuffer32->w, m_BackBuffer32->h, 0, 0, SCREEN_W, SCREEN_H);
 		} else {
 			blit(m_BackBuffer32, screen, 0, 0, 0, 0, m_BackBuffer32->w, m_BackBuffer32->h);

Managers/FrameMan.h

@@ -194,35 +194,17 @@ namespace RTE {
 		bool IsValidResolution(int width, int height) const;
 
 		/// <summary>
-		/// Tells how many times the windowed screen resolution is being multiplied and the back-buffer stretched across for better readability.
+		/// Tells how many times the screen resolution is being multiplied and the back-buffer stretched across for better readability.
 		/// </summary>
-		/// <returns>What multiple the windowed mode screen resolution is run in (1 normal).</returns>
-		int NxWindowed() const { return m_NxWindowed; }
+		/// <returns>What multiple the screen resolution is run in (1 normal).</returns>
+		int ResolutionMultiplier() const { return m_ResMultiplier; }
 
 		/// <summary>
 		/// Sets and switches to a new windowed mode multiplier.
 		/// </summary>
 		/// <param name="multiplier">The multiplier to switch to.</param>
 		/// <returns>Error code, anything other than 0 is error.</returns>
 		int SwitchWindowMultiplier(int multiplier = 1);
-
-		/// <summary>
-		/// Tells how many times the fullscreen resolution is being multiplied and the back-buffer stretched across for better readability.
-		/// </summary>
-		/// <returns>What multiple the fullscreen mode screen resolution is run in (1 normal).</returns>
-		int NxFullscreen() const { return m_NxFullscreen; }
-
-		/// <summary>
-		/// Gets how many times the fullscreen resolution will be multiplied ON NEXT RESTART and the back-buffer stretched.
-		/// </summary>
-		/// <returns>What multiple the fullscreen mode screen resolution will be run in on next restart of game.</returns>
-		int GetNewNxFullscreen() const { return m_NewNxFullscreen; }
-
-		/// <summary>
-		/// Sets how many times the fullscreen resolution will be multiplied ON NEXT RESTART and the back-buffer stretched.
-		/// </summary>
-		/// <param name="newMultiple">What multiple the fullscreen mode screen resolution will be run in on next restart of game.</param>
-		void SetNewNxFullscreen(int newMultiple) { m_NewNxFullscreen = newMultiple; }
 #pragma endregion
 
 #pragma region Split-Screen Handling
@@ -592,13 +574,8 @@ namespace RTE {
 
 		bool m_Fullscreen; //!< Whether in fullscreen mode or not.	
 
-		/// <summary>
-		/// The number of times the fullscreen mode resolution should be multiplied and stretched across for better visibility.
-		/// The internal virtual resolution (m_ResX, m_ResY) is 1/n of the actual fullscreen resolution that the graphics card outputs.
-		/// </summary>
-		int m_NxFullscreen;
-		int m_NewNxFullscreen; //!< This is the new fullscreen multiple that will take effect next time the FrameMan is started.
-		int m_NxWindowed; //!< The number of times the windowed mode resolution should be multiplied and stretched across for better visibility.
+		unsigned char m_ResMultiplier; //!< The number of times the game window and image should be multiplied and stretched across for better visibility.
+		unsigned char m_NewResMultiplier; //!< This is the new multiple that will take effect next time the FrameMan is started.
 
 		bool m_HSplit; //!< Whether the screen is split horizontally across the screen, ie as two splitscreens one above the other.		
 		bool m_VSplit; //!< Whether the screen is split vertically across the screen, ie as two splitscreens side by side.	

Managers/SettingsMan.cpp

@@ -136,14 +136,12 @@ int SettingsMan::ReadProperty(std::string propName, Reader &reader)
         g_FrameMan.ReadProperty(propName, reader);
     else if (propName == "ResolutionY")
         g_FrameMan.ReadProperty(propName, reader);
+	else if (propName == "ResolutionMultiplier")
+		g_FrameMan.ReadProperty(propName, reader);
     else if (propName == "PaletteFile")
         g_FrameMan.ReadProperty(propName, reader);
     else if (propName == "Fullscreen")
         g_FrameMan.ReadProperty(propName, reader);
-    else if (propName == "NxWindowed")
-        g_FrameMan.ReadProperty(propName, reader);
-    else if (propName == "NxFullscreen")
-        g_FrameMan.ReadProperty(propName, reader);
     else if (propName == "PixelsPerMeter")
         g_FrameMan.ReadProperty(propName, reader);
     else if (propName == "PlayIntro")
@@ -328,14 +326,12 @@ int SettingsMan::Save(Writer &writer) const
     writer << g_FrameMan.GetNewResX();
     writer.NewProperty("ResolutionY");
     writer << g_FrameMan.GetNewResY();
+	writer.NewProperty("ResolutionMultiplier");
+	writer << g_FrameMan.ResolutionMultiplier();
     writer.NewProperty("PaletteFile");
     writer << g_FrameMan.GetPaletteFile();
     writer.NewProperty("Fullscreen");
     writer << g_FrameMan.IsFullscreen();
-    writer.NewProperty("NxWindowed");
-    writer << g_FrameMan.NxWindowed();
-    writer.NewProperty("NxFullscreen");
-    writer << g_FrameMan.GetNewNxFullscreen();
     writer.NewProperty("PixelsPerMeter");
     writer << g_FrameMan.GetPPM();
     writer.NewProperty("PlayIntro");
@@ -518,15 +514,13 @@ int SettingsMan::SaveDefaults(Writer &writer) const
     writer << 960;
     writer.NewProperty("ResolutionY");
     writer << 540;
+	writer.NewProperty("ResolutionMultiplier");
+	writer << 1;
     writer.NewProperty("PaletteFile");
     ContentFile paletteFile("Base.rte/palette.bmp");
     writer << paletteFile;
     writer.NewProperty("Fullscreen");
     writer << 0;
-    writer.NewProperty("NxWindowed");
-    writer << 1;
-    writer.NewProperty("NxFullscreen");
-    writer << 2;
     writer.NewProperty("PixelsPerMeter");
     writer << 20;
     writer.NewProperty("PlayIntro");

Managers/UInputMan.cpp

@@ -2027,11 +2027,10 @@ void UInputMan::ForceMouseWithinBox(int x, int y, int width, int height, int whi
     // Only mess with the mouse if the original mouse position is not above the screen and may be grabbing the title bar of the game window
     if (!m_DisableMouseMoving && !m_TrapMousePos && (whichPlayer == -1 || m_aControlScheme[whichPlayer].GetDevice() == DEVICE_MOUSE_KEYB))
     {
-        float windowResMultiplier = g_FrameMan.IsFullscreen() ? g_FrameMan.NxFullscreen() : g_FrameMan.NxWindowed();
-        int mouseX = MAX(x, mouse_x);
-        int mouseY = MAX(y, mouse_y);
-        mouseX = MIN(mouseX, x + width * windowResMultiplier);
-        mouseY = MIN(mouseY, y + height * windowResMultiplier);
+        int mouseX = std::max(x, static_cast<int>(mouse_x));
+        int mouseY = std::max(y, static_cast<int>(mouse_y));
+        mouseX = std::min(mouseX, x + width * g_FrameMan.ResolutionMultiplier());
+        mouseY = std::min(mouseY, y + height * g_FrameMan.ResolutionMultiplier());
 
         position_mouse(mouseX, mouseY);
     }
@@ -2556,9 +2555,8 @@ int UInputMan::Update()
 
         // Enable the mouse cursor positioning again after having been disabled. Only do this when the mouse is within the drawing area so it
         // won't cause the whole window to move if the user clicks the title bar and unintentionally drags it due to programmatic positioning.
-        float mouseDenominator = g_FrameMan.IsFullscreen() ? g_FrameMan.NxFullscreen() : g_FrameMan.NxWindowed();
-        int mX = (float)mouse_x / mouseDenominator;
-        int mY = (float)mouse_y / mouseDenominator;
+        int mX = mouse_x / g_FrameMan.ResolutionMultiplier();
+        int mY = mouse_y / g_FrameMan.ResolutionMultiplier();
         if (m_DisableMouseMoving && m_PrepareToEnableMouseMoving && (mX >= 0 && mX < g_FrameMan.GetResX() && mY >= 0 && mY < g_FrameMan.GetResY()))
             m_DisableMouseMoving = m_PrepareToEnableMouseMoving = false;
     }