[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.38,1.39
Max Horn
fingolfin at users.sourceforge.net
Wed Mar 3 03:59:02 CET 2004
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25691
Modified Files:
main.cpp
Log Message:
fix for normal/default scaler behavior (not yet tested)
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- main.cpp 28 Feb 2004 12:57:52 -0000 1.38
+++ main.cpp 3 Mar 2004 11:37:51 -0000 1.39
@@ -233,13 +233,17 @@
if (!caption.isEmpty()) {
system->setWindowCaption(caption.c_str());
}
+
+ const bool useDefaultGraphicsMode =
+ !ConfMan.hasKey("gfx_mode", detector._targetName) ||
+ !scumm_stricmp(ConfMan.get("gfx_mode", detector._targetName).c_str(), "normal") ||
+ !scumm_stricmp(ConfMan.get("gfx_mode", detector._targetName).c_str(), "default");
// See if the game should default to 1x scaler
- if (!ConfMan.hasKey("gfx_mode", detector._targetName) &&
- (detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
+ if (useDefaultGraphicsMode && (detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {
system->setGraphicsMode(GFX_NORMAL);
} else {
- // Override global scaler with any game-specific define
+ // Override global scaler with any game-specific define
if (ConfMan.hasKey("gfx_mode")) {
system->setGraphicsMode(ConfMan.get("gfx_mode").c_str());
}
More information about the Scummvm-git-logs
mailing list