[Scummvm-cvs-logs] SF.net SVN: scummvm:[55721] scummvm/trunk/engines/sci/graphics
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Wed Feb 2 16:33:33 CET 2011
Revision: 55721
http://scummvm.svn.sourceforge.net/scummvm/?rev=55721&view=rev
Author: mthreepwood
Date: 2011-02-02 15:33:33 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
SCI: Fix GK1 Mac views, the game now starts
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/palette.cpp
scummvm/trunk/engines/sci/graphics/screen.cpp
scummvm/trunk/engines/sci/graphics/view.cpp
Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp 2011-02-02 15:21:24 UTC (rev 55720)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp 2011-02-02 15:33:33 UTC (rev 55721)
@@ -113,7 +113,7 @@
}
// palette formats in here are not really version exclusive, we can not use sci-version to differentiate between them
// they were just called that way, because they started appearing in sci1.1 for example
- if ((data[0] == 0 && data[1] == 1) || (data[0] == 0 && data[1] == 0 && READ_LE_UINT16(data + 29) == 0)) {
+ if ((data[0] == 0 && data[1] == 1) || (data[0] == 0 && data[1] == 0 && READ_SCI11ENDIAN_UINT16(data + 29) == 0)) {
// SCI0/SCI1 palette
palFormat = SCI_PAL_FORMAT_VARIABLE; // CONSTANT;
palOffset = 260;
@@ -123,7 +123,7 @@
// SCI1.1 palette
palFormat = data[32];
palOffset = 37;
- palColorStart = READ_LE_UINT16(data + 25); palColorCount = READ_LE_UINT16(data + 29);
+ palColorStart = READ_SCI11ENDIAN_UINT16(data + 25); palColorCount = READ_SCI11ENDIAN_UINT16(data + 29);
}
switch (palFormat) {
case SCI_PAL_FORMAT_CONSTANT:
Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp 2011-02-02 15:21:24 UTC (rev 55720)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp 2011-02-02 15:33:33 UTC (rev 55721)
@@ -53,6 +53,12 @@
#endif
}
+#ifdef ENABLE_SCI32
+ // GK1 Mac uses a 640x480 resolution too
+ if (g_sci->getGameId() == GID_GK1 && g_sci->getPlatform() == Common::kPlatformMacintosh)
+ _upscaledHires = GFX_SCREEN_UPSCALED_640x480;
+#endif
+
if (_resMan->detectHires()) {
_width = 640;
_height = 480;
Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp 2011-02-02 15:21:24 UTC (rev 55720)
+++ scummvm/trunk/engines/sci/graphics/view.cpp 2011-02-02 15:33:33 UTC (rev 55721)
@@ -448,7 +448,7 @@
} else {
literalPtr = _resourceData + celInfo->offsetLiteral;
if (celInfo->offsetRLE) {
- if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_1_1) {
+ if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() == SCI_VERSION_1_1) {
// KQ6 uses byte lengths, all others use uint16
// The SCI devs must have quickly realized that a max of 255 pixels wide
// was not very good for 320 or 640 width games.
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