[Scummvm-cvs-logs] SF.net SVN: scummvm:[47657] scummvm/trunk/engines/sci/sci.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Thu Jan 28 22:59:06 CET 2010


Revision: 47657
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47657&view=rev
Author:   m_kiewitz
Date:     2010-01-28 21:59:05 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
SCI: removed upscaled hires switch for sci2.1+ games (not needed anymore), added #ifdef SCI32 for gk1 upscaled hires switch

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-01-28 21:53:07 UTC (rev 47656)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-01-28 21:59:05 UTC (rev 47657)
@@ -121,8 +121,10 @@
 	if (getPlatform() == Common::kPlatformWindows) {
 		if (!strcmp(getGameID(), "kq6"))
 			upscaledHires = true;
+#ifdef ENABLE_SCI32
 		if (!strcmp(getGameID(), "gk1"))
 			upscaledHires = true;
+#endif
 	}
 
 	// Japanese versions of games use hi-res font on upscaled version of the game
@@ -132,17 +134,8 @@
 	// Initialize graphics-related parts
 	Screen *screen = 0;
 
-	bool isHires = _resMan->detectHires();
-
-#ifdef ENABLE_SCI32
-	// If SCI2 games are lowres (e.g. gk, qfg4/cd), switch to upscaled hires mode
-	// TODO: change SCI_VERSION_2_1 to SCI_VERSION_2, currently gk doesnt like us using upscaled hires mode
-	if ((!isHires) && (getSciVersion() >= SCI_VERSION_2_1))
-		upscaledHires = true;
-#endif
-
 	// invokes initGraphics()
-	if (isHires)
+	if (_resMan->detectHires())
 		screen = new Screen(_resMan, 640, 480, false);
 	else
 		screen = new Screen(_resMan, 320, 200, upscaledHires);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list