diff options
author | Filippos Karapetis | 2013-01-07 19:43:24 +0200 |
---|---|---|
committer | Filippos Karapetis | 2013-01-07 19:43:24 +0200 |
commit | e57c82f9dae625aec53530e6e1e8e06d6a13b533 (patch) | |
tree | dff26db5dda6feb89ccff3f8030bc9791eab123b /engines/hopkins/graphics.cpp | |
parent | 60e11931ba4e4bec8e6e38eb8e946ca71624c274 (diff) | |
download | scummvm-rg350-e57c82f9dae625aec53530e6e1e8e06d6a13b533.tar.gz scummvm-rg350-e57c82f9dae625aec53530e6e1e8e06d6a13b533.tar.bz2 scummvm-rg350-e57c82f9dae625aec53530e6e1e8e06d6a13b533.zip |
HOPKINS: Get rid of the NOSPRECRAN global variable
Diffstat (limited to 'engines/hopkins/graphics.cpp')
-rw-r--r-- | engines/hopkins/graphics.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index f66b4882a8..0021f3539e 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -1753,16 +1753,16 @@ void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp, } // Init Screen -void GraphicsManager::INI_ECRAN(const Common::String &file) { - OPTI_INI(file, 0); +void GraphicsManager::INI_ECRAN(const Common::String &file, bool initializeScreen) { + OPTI_INI(file, 0, initializeScreen); } // Init Screen 2 -void GraphicsManager::INI_ECRAN2(const Common::String &file) { - OPTI_INI(file, 2); +void GraphicsManager::INI_ECRAN2(const Common::String &file, bool initializeScreen) { + OPTI_INI(file, 2, initializeScreen); } -void GraphicsManager::OPTI_INI(const Common::String &file, int mode) { +void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initializeScreen) { Common::String filename = file + ".ini"; byte *ptr = _vm->_fileManager.searchCat(filename, 1); @@ -1773,7 +1773,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode) { if (!mode) { filename = file + ".spr"; _vm->_globals.SPRITE_ECRAN = _vm->_globals.freeMemory(_vm->_globals.SPRITE_ECRAN); - if (!_vm->_globals.NOSPRECRAN) { + if (initializeScreen) { _vm->_globals.SPRITE_ECRAN = _vm->_fileManager.searchCat(filename, 8); if (_vm->_globals.SPRITE_ECRAN) { _vm->_fileManager.constructFilename("LINK", filename); |