aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorEugene Sandulenko2005-03-25 22:11:08 +0000
committerEugene Sandulenko2005-03-25 22:11:08 +0000
commita9c2e6ecbfdc6be61c86e6ac9cb05e232f7e7d43 (patch)
treed1108444226cfa73fe489f4878446a9a2dce1e0a /gui
parent9a4bc8ce16dd8e5c4a15269cdda23398f9f59684 (diff)
downloadscummvm-rg350-a9c2e6ecbfdc6be61c86e6ac9cb05e232f7e7d43.tar.gz
scummvm-rg350-a9c2e6ecbfdc6be61c86e6ac9cb05e232f7e7d43.tar.bz2
scummvm-rg350-a9c2e6ecbfdc6be61c86e6ac9cb05e232f7e7d43.zip
MM NES fixes:
o Fixed crash when in-game GUI was displayed o Support for save/load o Savegame version bumped svn-id: r17232
Diffstat (limited to 'gui')
-rw-r--r--gui/newgui.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 9b9ff8f3bd..3bbbfc7ee1 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -83,7 +83,8 @@ void NewGui::updateScaleFactor() {
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.