diff options
author | Willem Jan Palenstijn | 2009-03-29 21:46:49 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2009-03-29 21:46:49 +0000 |
commit | 968856780bb474dde5ea5685c079cbcd60230377 (patch) | |
tree | 0de87fc08cf7cbc46c5f7561b604f9e9b777ffc2 /engines/sci/gfx/gfx_resmgr.h | |
parent | b524e3d285d04a7f9df139cc55fea13472eacf31 (diff) | |
download | scummvm-rg350-968856780bb474dde5ea5685c079cbcd60230377.tar.gz scummvm-rg350-968856780bb474dde5ea5685c079cbcd60230377.tar.bz2 scummvm-rg350-968856780bb474dde5ea5685c079cbcd60230377.zip |
SCI: Merge static palette into global palette at startup
svn-id: r39747
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.h')
-rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 8f5d02038a..6bfdfa2e23 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -224,14 +224,8 @@ public: const PaletteEntry &getColor(int color) { return _staticPalette->getColor(color); } - void setStaticPalette(Palette *newPalette) { - if (_staticPalette) - _staticPalette->free(); - - _staticPalette = newPalette; - _staticPalette->name = "static palette"; - } - + // Set static palette and merge it into the global palette + void setStaticPalette(Palette *newPalette); int getColorCount() { return _staticPalette ? _staticPalette->size() : 0; } private: |