From 4f0888b8b65531c71c7aefafd9dda0d662a0dfc1 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 11 Jul 2009 17:25:49 +0000 Subject: Removed the version parameter from GfxResManager svn-id: r42387 --- engines/sci/gfx/gfx_resmgr.cpp | 5 +++-- engines/sci/gfx/gfx_resmgr.h | 4 +--- engines/sci/gfx/operations.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'engines') diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index 9e9a8d2d13..f4c5fdf0dd 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -49,12 +49,13 @@ struct param_struct { GfxDriver *driver; }; -GfxResManager::GfxResManager(int version, gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager) : - _version(version), _options(options), _driver(driver), _resManager(resManager), +GfxResManager::GfxResManager(gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager) : + _options(options), _driver(driver), _resManager(resManager), _lockCounter(0), _tagLockCounter(0), _staticPalette(0) { gfxr_init_static_palette(); _portBounds = Common::Rect(0, 10, 320, 200); // default value, with a titlebar of 10px + _version = resManager->_volVersion; if (!_resManager->isVGA()) { _staticPalette = gfx_sci0_pic_colors->getref(); diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 8230e84aa0..fc4e0b3d6f 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -90,9 +90,7 @@ typedef Common::HashMap IntResMap; /** Graphics resource manager */ class GfxResManager { public: - GfxResManager(int version, gfx_options_t *options, - GfxDriver *driver, ResourceManager *resManager); - + GfxResManager(gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager); ~GfxResManager(); /** diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index f714ab0245..2c536912b3 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -423,7 +423,7 @@ int gfxop_init(int version, GfxState *state, gfx_options_t *options, ResourceMan state->driver = new GfxDriver(xfact, yfact, bpp); - state->gfxResMan = new GfxResManager(version, state->options, state->driver, resManager); + state->gfxResMan = new GfxResManager(state->options, state->driver, resManager); gfxop_set_clip_zone(state, gfx_rect(0, 0, 320, 200)); -- cgit v1.2.3