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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Jan 6 13:21:27 CET 2010


Revision: 47073
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47073&view=rev
Author:   thebluegr
Date:     2010-01-06 12:21:27 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
SCI2.1 and newer games always run at 640x480

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

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-01-06 12:17:03 UTC (rev 47072)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-01-06 12:21:27 UTC (rev 47073)
@@ -110,7 +110,7 @@
 	// Scale the screen, if needed
 	bool upscaledHires = (!strcmp(getGameID(), "kq6") 
 #ifdef ENABLE_SCI32
-							|| getSciVersion() >= SCI_VERSION_2
+							|| getSciVersion() == SCI_VERSION_2
 #endif
 							) && getPlatform() == Common::kPlatformWindows;
 
@@ -118,7 +118,16 @@
 	// TODO: Possibly look at first picture resource and determine if its hires or not
 
 	// Initialize graphics-related parts
-	Screen *screen = new Screen(_resMan, 320, 200, upscaledHires);	// invokes initGraphics()
+	Screen *screen = 0;
+	
+#ifdef ENABLE_SCI32
+	if (getSciVersion() >= SCI_VERSION_2_1)
+		screen = new Screen(_resMan, 640, 480, false);	// invokes initGraphics()
+	else
+#endif
+		screen = new Screen(_resMan, 320, 200, upscaledHires);	// invokes initGraphics()
+
+
 	SciPalette *palette = new SciPalette(_resMan, screen);
 	Cursor *cursor = new Cursor(_resMan, palette, screen);
 


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