[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.351,1.352

Eugene Sandulenko sev at users.sourceforge.net
Wed Mar 9 15:07:59 CET 2005


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

Modified Files:
	scumm.cpp 
Log Message:
Patch #1013937 "OSystem layer with bigger resolution". Now you will always
get at least 640x400 window. And finally we have means of implementing
nice looking GUI.

Also updated all backends. If your backend has ability to run with 640x400 or
640x480 resolution then read patch tracker item to find out details. Other
port maintainers shouldn't worry, as this patch doesn't affect them, they
still get their 320x200.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- scumm.cpp	9 Mar 2005 18:12:41 -0000	1.351
+++ scumm.cpp	9 Mar 2005 23:07:32 -0000	1.352
@@ -1162,19 +1162,21 @@
 	_system->beginGFXTransaction();
 		initCommonGFX(detector);
 		if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
-			_system->initSize(Common::kHercW, Common::kHercH);
+			_system->initSize(Common::kHercW, Common::kHercH, 1);
 			_features |= GF_DEFAULT_TO_1X_SCALER;
 			_system->setGraphicsMode("1x");
 		} else {
-			_system->initSize(_screenWidth, _screenHeight);
+			_system->initSize(_screenWidth, _screenHeight, 2);
+			if (_features & GF_DEFAULT_TO_1X_SCALER)
+				_system->setGraphicsMode("1x");
 		}
 
 		// FIXME: All this seems a dirty hack to me. We already
 		// have this check in constructor
 		if (_heversion >= 71) {
 			_features |= GF_DEFAULT_TO_1X_SCALER;
-			_system->setGraphicsMode("1x");
 		}
+
 	_system->endGFXTransaction();
 
 	int cd_num = ConfMan.getInt("cdrom");





More information about the Scummvm-git-logs mailing list