aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-11 17:25:49 +0000
committerFilippos Karapetis2009-07-11 17:25:49 +0000
commit4f0888b8b65531c71c7aefafd9dda0d662a0dfc1 (patch)
treed368cd3b5905e0d0de48e2a5d8dc4c83ce5ad676 /engines/sci/gfx
parent848b9cda03ce5417ea2c89612fc411699643ff9c (diff)
downloadscummvm-rg350-4f0888b8b65531c71c7aefafd9dda0d662a0dfc1.tar.gz
scummvm-rg350-4f0888b8b65531c71c7aefafd9dda0d662a0dfc1.tar.bz2
scummvm-rg350-4f0888b8b65531c71c7aefafd9dda0d662a0dfc1.zip
Removed the version parameter from GfxResManager
svn-id: r42387
Diffstat (limited to 'engines/sci/gfx')
-rw-r--r--engines/sci/gfx/gfx_resmgr.cpp5
-rw-r--r--engines/sci/gfx/gfx_resmgr.h4
-rw-r--r--engines/sci/gfx/operations.cpp2
3 files changed, 5 insertions, 6 deletions
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<int, gfx_resource_t *> 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));