[Scummvm-cvs-logs] SF.net SVN: scummvm:[43450] scummvm/trunk/engines/sci
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Sun Aug 16 21:19:27 CEST 2009
Revision: 43450
http://scummvm.svn.sourceforge.net/scummvm/?rev=43450&view=rev
Author: waltervn
Date: 2009-08-16 19:19:26 +0000 (Sun, 16 Aug 2009)
Log Message:
-----------
SCI: Fix regression in previous commit (QFG2).
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
scummvm/trunk/engines/sci/resource.h
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-08-16 19:18:19 UTC (rev 43449)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp 2009-08-16 19:19:26 UTC (rev 43450)
@@ -532,8 +532,7 @@
int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr);
if (!_resManager->isVGA()) {
- // TODO: Check which versions this applies to
- int pal = (_version < SCI_VERSION_1_EARLY) ? -1 : palette;
+ int pal = (_version <= SCI_VERSION_01) ? -1 : palette;
view = getEGAView(resid, viewRes->data, viewRes->size, pal);
} else {
if (_version < SCI_VERSION_1_1)
Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h 2009-08-16 19:18:19 UTC (rev 43449)
+++ scummvm/trunk/engines/sci/resource.h 2009-08-16 19:19:26 UTC (rev 43450)
@@ -52,8 +52,8 @@
SCI_VERSION_0_LATE, // KQ4, LSL2, LSL3, SQ3 etc
SCI_VERSION_01, // KQ1 and multilingual games (S.old.*)
SCI_VERSION_1_EGA, // EGA with parser, QFG2
- SCI_VERSION_1_EARLY, // KQ5, LSL1. (EGA/VGA)
- SCI_VERSION_1_LATE, // ECO1, LSL5. (EGA/VGA)
+ SCI_VERSION_1_EARLY, // KQ5. (EGA/VGA)
+ SCI_VERSION_1_LATE, // ECO1, LSL1, LSL5. (EGA/VGA)
SCI_VERSION_1_1, // KQ6, ECO2
SCI_VERSION_32 // GK
};
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