aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-06 12:21:27 +0000
committerFilippos Karapetis2010-01-06 12:21:27 +0000
commit3d3d0dee1b8cbc570d1626b1ca8e690f84cf54c5 (patch)
tree8c0a2d123330b378405aed11be1da0d410c34c72 /engines
parentbcf7535c97ef6a49bbc9d110257caf7de49cfaed (diff)
downloadscummvm-rg350-3d3d0dee1b8cbc570d1626b1ca8e690f84cf54c5.tar.gz
scummvm-rg350-3d3d0dee1b8cbc570d1626b1ca8e690f84cf54c5.tar.bz2
scummvm-rg350-3d3d0dee1b8cbc570d1626b1ca8e690f84cf54c5.zip
SCI2.1 and newer games always run at 640x480
svn-id: r47073
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sci.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 8ae054655b..ac5c734d6c 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -110,7 +110,7 @@ Common::Error SciEngine::run() {
// 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 @@ Common::Error SciEngine::run() {
// 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);