diff options
| author | Joseph-Eugene Winzer | 2017-06-22 19:07:13 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-22 23:40:27 +0000 |
| commit | 29021aa7dd2461e85de82799349de00d0c6e3994 (patch) | |
| tree | 44e37efe973aaff554d5ac291f16d4dd9caf6369 | |
| parent | 7da3ab2611f28aa5a05582c1fec799a371c35c59 (diff) | |
| download | scummvm-rg350-29021aa7dd2461e85de82799349de00d0c6e3994.tar.gz scummvm-rg350-29021aa7dd2461e85de82799349de00d0c6e3994.tar.bz2 scummvm-rg350-29021aa7dd2461e85de82799349de00d0c6e3994.zip | |
SUPERNOVA: Refactoring
| -rw-r--r-- | engines/supernova/supernova.cpp | 5 | ||||
| -rw-r--r-- | engines/supernova/supernova.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index b83e901510..6c29e57f39 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -222,7 +222,6 @@ void SupernovaEngine::renderImage(int filenumber, int section, bool fullscreen) error("File %s could not be read!", file.getName()); } - _currentImageFilenumber = filenumber; if (_currentImage.loadStream(file) && _currentImage.loadSection(section)) { _system->getPaletteManager()->setPalette(_currentImage.getPalette(), 16, 239); paletteBrightness(); @@ -1092,7 +1091,7 @@ void GameManager::executeRoom() { // This is locked. _vm->renderMessage("Das ist verschlossen."); } else { - _vm->renderImage(_vm->_currentImageFilenumber, _inputObject[0]._section); + _vm->renderImage(_currentRoom->getFileNumber(), _inputObject[0]._section); _inputObject[0].setProperty(OPENED); byte i = _inputObject[0]._click; _inputObject[0]._click = _inputObject[0]._click2; @@ -1111,7 +1110,7 @@ void GameManager::executeRoom() { // This is already closed. _vm->renderMessage("Das ist schon geschlossen."); } else { - _vm->renderImage(_vm->_currentImageFilenumber, invertSection(_inputObject[0]._section)); + _vm->renderImage(_currentRoom->getFileNumber(), invertSection(_inputObject[0]._section)); _inputObject[0].disableProperty(OPENED); byte i = _inputObject[0]._click; _inputObject[0]._click = _inputObject[0]._click2; diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h index a63beb1ee0..801637aab6 100644 --- a/engines/supernova/supernova.h +++ b/engines/supernova/supernova.h @@ -81,7 +81,6 @@ public: Audio::SoundHandle _soundHandle; ScreenBufferStack _screenBuffer; MSNImageDecoder _currentImage; - int _currentImageFilenumber; Common::Event _event; bool _gameRunning; |