diff options
| -rw-r--r-- | engines/access/files.cpp | 5 | ||||
| -rw-r--r-- | engines/access/screen.cpp | 7 | ||||
| -rw-r--r-- | engines/access/screen.h | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/engines/access/files.cpp b/engines/access/files.cpp index 0705b5d227..dacceb7a09 100644 --- a/engines/access/files.cpp +++ b/engines/access/files.cpp @@ -144,7 +144,10 @@ void FileManager::loadScreen(Graphics::Surface *dest, int fileNum, int subfile) } void FileManager::handleScreen(Graphics::Surface *dest, Resource *res) { - _vm->_screen->loadPalette(res->_stream); + _vm->_screen->loadRawPalette(res->_stream); + if (_setPaletteFlag) + _vm->_screen->setPalette(); + _setPaletteFlag = true; // The remainder of the file after the palette may be separately compressed, // so call handleFile to handle it if it is diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp index 3e0863cc31..f98552470c 100644 --- a/engines/access/screen.cpp +++ b/engines/access/screen.cpp @@ -99,13 +99,6 @@ void Screen::setInitialPalettte() { g_system->getPaletteManager()->setPalette(INITIAL_PALETTE, 0, 18); } -void Screen::loadPalette(Common::SeekableReadStream *stream) { - loadRawPalette(stream); - if (_vm->_files->_setPaletteFlag) - setPalette(); - _vm->_files->_setPaletteFlag = true; -} - void Screen::loadPalette(int fileNum, int subfile) { Resource *res = _vm->_files->loadFile(fileNum, subfile); byte *palette = res->data(); diff --git a/engines/access/screen.h b/engines/access/screen.h index 2db05a5f9d..8875ce12b7 100644 --- a/engines/access/screen.h +++ b/engines/access/screen.h @@ -121,8 +121,6 @@ public: */ void setIconPalette() {} - void loadPalette(Common::SeekableReadStream *stream); - void loadPalette(int fileNum, int subfile); void setPalette(); |