diff options
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 9 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 9 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_state_internal.h | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_widgets.h | 1 |
4 files changed, 4 insertions, 16 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; diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 5cd5d018cc..75072f5ede 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -231,15 +231,6 @@ public: int calculatePic(gfxr_pic_t *scaled_pic, gfxr_pic_t *unscaled_pic, int flags, int default_palette, int nr); - /** - * Determines whether support for pointers with more than two colors - * is required. - * - * @return false if no support for multi-colored pointers is required, - * true otherwise - */ - bool multicoloredPointers() { return _version > SCI_VERSION_1; } - /** * Frees all resources currently allocated. diff --git a/engines/sci/gfx/gfx_state_internal.h b/engines/sci/gfx/gfx_state_internal.h index 3beb0ea067..1bff83e713 100644 --- a/engines/sci/gfx/gfx_state_internal.h +++ b/engines/sci/gfx/gfx_state_internal.h @@ -26,6 +26,7 @@ #ifndef SCI_GFX_GFX_STATE_INTERNAL_H #define SCI_GFX_GFX_STATE_INTERNAL_H +#include "sci/engine/vm.h" #include "sci/gfx/gfx_tools.h" #include "sci/gfx/gfx_options.h" #include "sci/gfx/operations.h" diff --git a/engines/sci/gfx/gfx_widgets.h b/engines/sci/gfx/gfx_widgets.h index 80129152cb..ace13ff1b9 100644 --- a/engines/sci/gfx/gfx_widgets.h +++ b/engines/sci/gfx/gfx_widgets.h @@ -29,6 +29,7 @@ #include "common/rect.h" +#include "sci/engine/vm.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/operations.h" |