[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.332,1.333

Eugene Sandulenko sev at users.sourceforge.net
Mon Feb 21 17:30:26 CET 2005


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

Modified Files:
	scumm.cpp 
Log Message:
Implementation of GFX transactions. May cause some regressions in case I
missed some unusual mode switching. This implementation let us avoid two nasty
hacks in scumm.cpp.

*Now* we could return to OSystem layers.
patch.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- scumm.cpp	21 Feb 2005 14:27:09 -0000	1.332
+++ scumm.cpp	22 Feb 2005 01:29:27 -0000	1.333
@@ -1040,16 +1040,12 @@
 		_screenWidth = 320;
 		_screenHeight = 240;
 	} else if (_features & GF_DEFAULT_TO_1X_SCALER) {
-		// FIXME: a dirty hack. Currently this is checked before engine
-		//  creation.
-		_system->setGraphicsMode("1x");
 		_screenWidth = 640;
 		_screenHeight = 480;
 	} else if (_features & GF_NES) {
 		_screenWidth = 256;
 		_screenHeight = 240;
 	} else if (_renderMode == Common::kRenderHerc) {
-		_system->setGraphicsMode("1x");
 		_features |= GF_DEFAULT_TO_1X_SCALER;
 		_screenWidth = 320;
 		_screenHeight = 200;





More information about the Scummvm-git-logs mailing list