Add check to limit scale based on resolution

8dcf4118 · pickle136 · b482cdbe · 8dcf4118
Commit 8dcf4118 authored Apr 02, 2010 by pickle136
Show whitespace changes
Inline Side-by-side

Showing with 136 additions and 129 deletions

setupmenu.cpp src/menu/setupmenu.cpp +136 -129

No files found.
--- a/src/menu/setupmenu.cpp
+++ b/src/menu/setupmenu.cpp
@@ -445,6 +445,13 @@ int Menu::setupScaling () {

 		if ((controls.release(C_UP) || controls.release(C_RIGHT)) && (scaleFactor < MAX_SCALE)) scaleFactor++;

+		// Check that the scale will fit in the current resolution
+		if ( screenW/320 < scaleFactor || screenH/200 < scaleFactor ) {
+
+			scaleFactor = oldScaleFactor;
+
+		}
+
 		// Check for a scaling change
 		if (scaleFactor != oldScaleFactor) {