[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.104,1.105

Eugene Sandulenko sev at users.sourceforge.net
Fri Mar 25 14:11:44 CET 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29004/gui

Modified Files:
	newgui.cpp 
Log Message:
MM NES fixes:
  o Fixed crash when in-game GUI was displayed
  o Support for save/load
  o Savegame version bumped


Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- newgui.cpp	12 Mar 2005 15:29:16 -0000	1.104
+++ newgui.cpp	25 Mar 2005 22:11:07 -0000	1.105
@@ -83,7 +83,8 @@
 			kDefaultGUIHeight = 200
 		};
 	
-		_scaleFactor = MIN(_system->getOverlayWidth() / kDefaultGUIWidth, _system->getOverlayHeight() / kDefaultGUIHeight);
+		// NES has 256 pixels width which makes MIN() return 0 here.
+		_scaleFactor = MAX(MIN(_system->getOverlayWidth() / kDefaultGUIWidth, _system->getOverlayHeight() / kDefaultGUIHeight), 1);
 	}
 
 	// Pick the font depending on the scale factor.





More information about the Scummvm-git-logs mailing list