[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.132,1.133

Jamieson Christian jamieson630 at users.sourceforge.net
Mon Aug 11 02:49:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv24243/scummvm/common

Modified Files:
	gameDetector.cpp 
Log Message:
Fix for Bug [779013] ALL: Fullscreen and -F

Fixed behavior of command line options that
are treated as "[scummvm]" modifiers by
default. I'm not even sure if "[scummvm]"
mods still work (or require special code)
so we might be able to get rid of old code.

Also added --fullscreen and --no-fullscreen
command line options.

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- gameDetector.cpp	8 Aug 2003 09:09:06 -0000	1.132
+++ gameDetector.cpp	11 Aug 2003 09:48:26 -0000	1.133
@@ -399,6 +399,7 @@
 			case 'f':
 				CHECK_OPTION();
 				_fullScreen = (c == 'f');
+				g_config->setBool("fullscreen", _fullScreen);
 				g_config->setBool("fullscreen", _fullScreen, "scummvm");
 				break;
 			case 'g':
@@ -406,6 +407,7 @@
 				_gfx_mode = parseGraphicsMode(option);
 				if (_gfx_mode == -1)
 					goto ShowHelpAndExit;
+				g_config->set("gfx_mode", option);
 				g_config->set("gfx_mode", option, "scummvm");
 				break;
 			// case 'h': reserved for help
@@ -500,6 +502,7 @@
 					s += 3;
 				} else
 					long_option_value = true;
+
 				if (!strcmp (s, "multi-midi")) {
 					_multi_midi = long_option_value;
 					g_config->setBool ("multi_midi", _multi_midi);
@@ -509,6 +512,10 @@
 				} else if (!strcmp (s, "aspect-ratio")) {
 					_aspectRatio = long_option_value;
 					g_config->setBool ("aspect_ratio", _aspectRatio);
+				} else if (!strcmp (s, "fullscreen")) {
+					_fullScreen = long_option_value;
+					g_config->setBool("fullscreen", _fullScreen);
+					g_config->setBool("fullscreen", _fullScreen, "scummvm");
 #ifndef DISABLE_SCUMM
 				} else if (!strcmp (s, "demo-mode")) {
 					_demo_mode = long_option_value;





More information about the Scummvm-git-logs mailing list