diff options
| author | Walter van Niftrik | 2009-08-16 19:19:26 +0000 |
|---|---|---|
| committer | Walter van Niftrik | 2009-08-16 19:19:26 +0000 |
| commit | 83e541900d1bbd2a85416498618d5b5d86228874 (patch) | |
| tree | 115a036dd35c9e77136fb120ad94297ce75f1abc | |
| parent | 00f4794c0a0168a86d7e58e3f585f7fa4d02c7c9 (diff) | |
| download | scummvm-rg350-83e541900d1bbd2a85416498618d5b5d86228874.tar.gz scummvm-rg350-83e541900d1bbd2a85416498618d5b5d86228874.tar.bz2 scummvm-rg350-83e541900d1bbd2a85416498618d5b5d86228874.zip | |
SCI: Fix regression in previous commit (QFG2).
svn-id: r43450
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/resource.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index d79ae3fef9..5619a896cf 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -532,8 +532,7 @@ gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) { 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) diff --git a/engines/sci/resource.h b/engines/sci/resource.h index f3be505123..1ab49c834e 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -52,8 +52,8 @@ enum SciVersion { 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 }; |