diff options
author | Filippos Karapetis | 2009-03-23 08:43:53 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-03-23 08:43:53 +0000 |
commit | a6f49a636bf0e8cef76bc416d80ed10020a1924a (patch) | |
tree | ccdc650a66009b93eb5f51b84ba531fbfc44313e /engines/sci/gfx/gfx_resmgr.h | |
parent | 93ff05cb6de0ed8b199eab31812421e03a94809c (diff) | |
download | scummvm-rg350-a6f49a636bf0e8cef76bc416d80ed10020a1924a.tar.gz scummvm-rg350-a6f49a636bf0e8cef76bc416d80ed10020a1924a.tar.bz2 scummvm-rg350-a6f49a636bf0e8cef76bc416d80ed10020a1924a.zip |
- Moved palette initialization inside the graphics resource manager
- The static palette is no longer needlessly referenced directly outside the graphics resource manager
- Moved the SCI interpreter version inside the graphics resource manager, instead of gfx_state_t
svn-id: r39626
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.h')
-rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 6d303dfaf4..cb18ca5ae7 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -102,11 +102,9 @@ struct gfx_resstate_t { class GfxResManager { public: - GfxResManager(int version, gfx_options_t *options, gfx_driver_t *driver, Palette *staticPalette, ResourceManager *resManager) : - _version(version), _options(options), _driver(driver), _resManager(resManager), - _staticPalette(staticPalette), _lockCounter(0), _tagLockCounter(0) {} - ~GfxResManager() {} + GfxResManager(int version, gfx_options_t *options, gfx_driver_t *driver, ResourceManager *resManager); + ~GfxResManager(); /* Calculates a unique hash value for the specified options/type setup ** Parameters: (gfx_resource_type_t) type: The type the hash is to be generated for @@ -240,20 +238,17 @@ public: */ void freeResManager(); - Palette *getStaticPalette() { return _staticPalette; } + const PaletteEntry &getColor(int color) { return _staticPalette->getColor(color); } void setStaticPalette(Palette *newPalette) { - freeStaticPalette(); - _staticPalette = newPalette; - _staticPalette->name = "static palette"; - } - - void freeStaticPalette() { if (_staticPalette) _staticPalette->free(); + + _staticPalette = newPalette; + _staticPalette->name = "static palette"; } - int getNumberOfColors() { return _staticPalette ? _staticPalette->size() : 0; } + int getColorCount() { return _staticPalette ? _staticPalette->size() : 0; } private: int _version; |