diff options
| author | Norbert Lange | 2009-08-17 12:58:53 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-17 12:58:53 +0000 |
| commit | cc3a20c13cbf642dd08454d3cbd79edb6b3d3176 (patch) | |
| tree | 64197760262270bf9c90d367864150ceb4b1f5b4 /engines/sci/gfx/gfx_resmgr.cpp | |
| parent | c96affd0c1e5480fe1a4a3d3e82583c795570d21 (diff) | |
| parent | e548e71ba1092a1091da79c5d4652c9d52578e65 (diff) | |
| download | scummvm-rg350-cc3a20c13cbf642dd08454d3cbd79edb6b3d3176.tar.gz scummvm-rg350-cc3a20c13cbf642dd08454d3cbd79edb6b3d3176.tar.bz2 scummvm-rg350-cc3a20c13cbf642dd08454d3cbd79edb6b3d3176.zip | |
merge with trunk
svn-id: r43478
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.cpp')
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index fbae7105c9..5619a896cf 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -57,11 +57,6 @@ GfxResManager::GfxResManager(gfx_options_t *options, GfxDriver *driver, Resource _portBounds = Common::Rect(0, 10, 320, 200); // default value, with a titlebar of 10px _version = resManager->sciVersion(); - // Workaround for QFG1 VGA (has SCI 1.1 view data with SCI 1 compression) - if (_version == SCI_VERSION_1 && !strcmp(((SciEngine*)g_engine)->getGameID(), "qfg1")) { - _version = SCI_VERSION_1_1; - } - if (!_resManager->isVGA()) { _staticPalette = gfx_sci0_pic_colors->getref(); } else if (_version == SCI_VERSION_1_1) { @@ -537,7 +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()) { - int pal = (_version == SCI_VERSION_0) ? -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) @@ -679,7 +674,7 @@ gfx_pixmap_t *GfxResManager::getCursor(int num) { } gfx_pixmap_t *cursor = gfxr_draw_cursor(GFXR_RES_ID(GFX_RESOURCE_TYPE_CURSOR, num), - cursorRes->data, cursorRes->size, _version != SCI_VERSION_0); + cursorRes->data, cursorRes->size, _version > SCI_VERSION_01); if (!cursor) return NULL; |