[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.102,1.103 gameDetector.h,1.32,1.33 main.cpp,1.72,1.73

Eugene Sandulenko sev at users.sourceforge.net
Thu Mar 10 08:30:00 CET 2005


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

Modified Files:
	gameDetector.cpp gameDetector.h main.cpp 
Log Message:
Add --force-1x-overlay command line option as discussed in bugreport
#1160454 "ALL: Failed assertion when using 1x scaler"


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- gameDetector.cpp	7 Mar 2005 00:39:47 -0000	1.102
+++ gameDetector.cpp	10 Mar 2005 16:29:06 -0000	1.103
@@ -98,6 +98,7 @@
 	"  --aspect-ratio           Enable aspect ratio correction\n"
 	"  --render-mode=MODE       Enable additional render modes (cga, ega, hercGreen,\n"
     "                           hercAmber, amiga)\n"
+	"  --force-1x-overlay       Make inner GUI 320x200\n"
 	"\n"
 #if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
 	"  --alt-intro              Use alternative intro for CD versions of Beneath a\n"
@@ -205,6 +206,7 @@
 #endif
 
 	_dumpScripts = false;
+	_force1xOverlay = false;
 
 	memset(&_game, 0, sizeof(_game));
 	_plugin = 0;
@@ -489,6 +491,10 @@
 				ConfMan.set("render_mode", option, kTransientDomain);
 			END_OPTION
 
+			DO_LONG_OPTION_BOOL("force-1x-overlay")
+				_force1xOverlay = true;
+			END_OPTION
+
 			DO_LONG_OPTION("savepath")
 				// TODO: Verify whether the path is valid
 				ConfMan.set("savepath", option, kTransientDomain);

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gameDetector.h	1 Jan 2005 16:08:49 -0000	1.32
+++ gameDetector.h	10 Mar 2005 16:29:07 -0000	1.33
@@ -59,6 +59,8 @@
 	
 	bool _dumpScripts;
 
+	bool _force1xOverlay;
+
 	void setTarget(const String &name);
 
 public:

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- main.cpp	9 Mar 2005 23:07:30 -0000	1.72
+++ main.cpp	10 Mar 2005 16:29:07 -0000	1.73
@@ -224,7 +224,7 @@
 		system.setGraphicsMode(ConfMan.get("gfx_mode").c_str());
 	
 		// Make GUI 640 x 400
-		system.initSize(320, 200, 2);
+		system.initSize(320, 200, (detector._force1xOverlay ? 1 : 2));
 	system.endGFXTransaction();
 
 	





More information about the Scummvm-git-logs mailing list