diff options
author | Filippos Karapetis | 2009-07-07 07:44:25 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-07-07 07:44:25 +0000 |
commit | c716e43a2bad7fbf7ad6e1ea0594a84cb24ae49b (patch) | |
tree | 38efc5afd0a928a3db3fc9e6cbb9d32459f579e2 /engines/sci/gfx/gfx_resmgr.h | |
parent | b50b5ae5a4d896a0319d661f16641e5b35855b60 (diff) | |
download | scummvm-rg350-c716e43a2bad7fbf7ad6e1ea0594a84cb24ae49b.tar.gz scummvm-rg350-c716e43a2bad7fbf7ad6e1ea0594a84cb24ae49b.tar.bz2 scummvm-rg350-c716e43a2bad7fbf7ad6e1ea0594a84cb24ae49b.zip |
- Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01
- Simplified the checks for EGA and VGA graphics
- Fixed a bug in script_adjust_opcode_formats()
- Simplified the code in GfxResManager::getView() a bit
svn-id: r42206
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.h')
-rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 1f0f58dce9..8230e84aa0 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -90,7 +90,7 @@ typedef Common::HashMap<int, gfx_resource_t *> IntResMap; /** Graphics resource manager */ class GfxResManager { public: - GfxResManager(int version, bool isVGA, gfx_options_t *options, + GfxResManager(int version, gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager); ~GfxResManager(); @@ -311,14 +311,12 @@ public: * * @return Number of pallete entries */ - int getColorCount() - { + int getColorCount() { return _staticPalette ? _staticPalette->size() : 0; } private: int _version; - bool _isVGA; gfx_options_t *_options; GfxDriver *_driver; Palette *_staticPalette; |