[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.17,1.18

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv5350

Modified Files:
	main.cpp 
Log Message:
small fix: if one specifies fullscreen=true in the 'scummvm' config section but fullscreen=false in the game specific config section, ScummVM now properly disables fullscreen mode; also, don't use setvbuf with a NULL bufer and a non-zero size param, that's not portable -> use setlinebuf instead

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- main.cpp	17 Oct 2003 17:05:19 -0000	1.17
+++ main.cpp	1 Nov 2003 19:13:48 -0000	1.18
@@ -228,7 +228,7 @@
 		}
 #endif
 	}
-	setvbuf(stdout, NULL, _IOLBF, BUFSIZ);	/* Line buffered */
+	setlinebuf(stdout);	/* Line buffered */
 	setbuf(stderr, NULL);			/* No buffering */
 
 #endif //defined(WIN32) && defined(USE_CONSOLE)
@@ -289,11 +289,9 @@
 			system->property(OSystem::PROP_SET_GFX_MODE, &prop);
 		}
 	
-		// Override global fullscreen setting with any game-specific define
-		if (ConfMan.getBool("fullscreen")) {
-			if (!system->property(OSystem::PROP_GET_FULLSCREEN, 0))
-				system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
-		}
+		// (De)activate fullscreen mode as determined by the config settings 
+		if (ConfMan.getBool("fullscreen") != system->property(OSystem::PROP_GET_FULLSCREEN, 0))
+			system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
 	
 		// Create the game engine
 		Engine *engine = detector.createEngine(system);