[Scummvm-cvs-logs] scummvm master -> 9f4319373013b45ff8232a85a79a62ff15aa7971

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f43193730 SCI32: PQ4 seems to support high resolution too


Commit: 9f4319373013b45ff8232a85a79a62ff15aa7971
    https://github.com/scummvm/scummvm/commit/9f4319373013b45ff8232a85a79a62ff15aa7971
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-22T02:30:13+01:00

Commit Message:
SCI32: PQ4 seems to support high resolution too

Changed paths:
    engines/sci/detection_tables.h
    engines/sci/graphics/screen.cpp
    engines/sci/sci.cpp



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 92c19a1..2562321 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2982,7 +2982,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"resource.map", 0, "379dfe80ed6bd16c47e4b950c4722eac", 11374},
 		{"resource.000", 0, "fd316a09b628b7032248139003369022", 18841068},
 		AD_LISTEND},
-		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD | ADGF_UNSTABLE, GUIO3(GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD | ADGF_UNSTABLE, GUIO4(GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
 	// Police Quest 4 - German DOS CD (German text, English speech)
 	// Supplied by markcoolio in bug report #3392955
@@ -2990,7 +2990,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"resource.map", 0, "a398076371ed0e1e706c8f9fb9fc7ac5", 11386},
 		{"resource.000", 0, "6ff21954e0a2c5992279e7eb787c8d56", 18918747},
 		AD_LISTEND},
-		Common::DE_DEU, Common::kPlatformDOS, ADGF_CD | ADGF_UNSTABLE, GUIO3(GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+		Common::DE_DEU, Common::kPlatformDOS, ADGF_CD | ADGF_UNSTABLE, GUIO4(GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
 	// Police Quest 4 - English DOS
 	// SCI interpreter version 2.000.000 (a guess?)
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 667f3fd..4cd6344 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -56,6 +56,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 #ifdef ENABLE_SCI32
 		if (g_sci->getGameId() == GID_GK1)
 			_upscaledHires = GFX_SCREEN_UPSCALED_640x480;
+		if (g_sci->getGameId() == GID_PQ4)
+			_upscaledHires = GFX_SCREEN_UPSCALED_640x480;
 #endif
 	}
 
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 8f9c584..5265ada 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -229,7 +229,7 @@ Common::Error SciEngine::run() {
 	//  - King's Quest 6 CD
 	//  - King's Quest 6 CD demo
 	//  - Gabriel Knight 1 CD
-	// TODO: Police Quest 4?
+	//  - Police Quest 4 CD
 	// TODO: Check, if Gabriel Knight 1 floppy supports high resolution
 	// TODO: Check, if Gabriel Knight 1 on Mac supports high resolution
 	switch (getPlatform()) {
@@ -245,6 +245,10 @@ Common::Error SciEngine::run() {
 			if ((isCD()) && (!isDemo()))
 				_forceHiresGraphics = ConfMan.getBool("enable_high_resolution_graphics");
 			break;
+		case GID_PQ4:
+			if (isCD())
+				_forceHiresGraphics = ConfMan.getBool("enable_high_resolution_graphics");
+			break;
 		default:
 			break;
 		}