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

[m_kiewitz at users.sourceforge.net]

Revision: 49041
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49041&view=rev
Author:   m_kiewitz
Date:     2010-05-15 15:16:32 +0000 (Sat, 15 May 2010)

Log Message:
-----------
SCI: adding special 640x440 upscaling mode for kq6, finally hires portraits are drawn at the right position

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/cursor.cpp
    scummvm/trunk/engines/sci/graphics/screen.cpp
    scummvm/trunk/engines/sci/graphics/screen.h
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/graphics/cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.cpp	2010-05-15 14:17:50 UTC (rev 49040)
+++ scummvm/trunk/engines/sci/graphics/cursor.cpp	2010-05-15 15:16:32 UTC (rev 49041)
@@ -222,6 +222,10 @@
 		mousePos.x /= 2;
 		mousePos.y /= 2;
 		break;
+	case GFX_SCREEN_UPSCALED_640x440:
+		mousePos.x /= 2;
+		mousePos.y = (mousePos.y * 5) / 11;
+		break;
 	case GFX_SCREEN_UPSCALED_640x480:
 		mousePos.x /= 2;
 		mousePos.y = (mousePos.y * 5) / 12;

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-05-15 14:17:50 UTC (rev 49040)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-05-15 15:16:32 UTC (rev 49041)
@@ -47,6 +47,12 @@
 		for (int i = 0; i <= _height; i++)
 			_upscaledMapping[i] = i * 2;
 		break;
+	case GFX_SCREEN_UPSCALED_640x440:
+		_displayWidth = 640;
+		_displayHeight = 440;
+		for (int i = 0; i <= _height; i++)
+			_upscaledMapping[i] = (i * 11) / 5;
+		break;
 	case GFX_SCREEN_UPSCALED_640x480:
 		_displayWidth = 640;
 		_displayHeight = 480;

Modified: scummvm/trunk/engines/sci/graphics/screen.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.h	2010-05-15 14:17:50 UTC (rev 49040)
+++ scummvm/trunk/engines/sci/graphics/screen.h	2010-05-15 15:16:32 UTC (rev 49041)
@@ -38,7 +38,8 @@
 enum GfxScreenUpscaledMode {
 	GFX_SCREEN_UPSCALED_DISABLED	= 0,
 	GFX_SCREEN_UPSCALED_640x400		= 1,
-	GFX_SCREEN_UPSCALED_640x480		= 2
+	GFX_SCREEN_UPSCALED_640x440		= 2,
+	GFX_SCREEN_UPSCALED_640x480		= 3
 };
 
 enum GfxScreenMasks {

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-05-15 14:17:50 UTC (rev 49040)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-05-15 15:16:32 UTC (rev 49041)
@@ -148,7 +148,7 @@
 	//  it to platform windows.
 	if (getPlatform() == Common::kPlatformWindows) {
 		if (!strcmp(getGameID(), "kq6"))
-			upscaledHires = GFX_SCREEN_UPSCALED_640x480;
+			upscaledHires = GFX_SCREEN_UPSCALED_640x440;
 #ifdef ENABLE_SCI32
 		if (!strcmp(getGameID(), "gk1"))
 			upscaledHires = GFX_SCREEN_UPSCALED_640x480;


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