diff options
| author | Thierry Crozat | 2017-11-16 03:17:44 +0000 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 02:15:40 +0000 |
| commit | 888930660a5a4bef4fe00e69f267ce0d35492dd8 (patch) | |
| tree | 8196f70987c2436c2476b80b91b0580fdfa5fe9a /engines/supernova/state.cpp | |
| parent | 624425077b0353303a72192906c495f619099b7d (diff) | |
| download | scummvm-rg350-888930660a5a4bef4fe00e69f267ce0d35492dd8.tar.gz scummvm-rg350-888930660a5a4bef4fe00e69f267ce0d35492dd8.tar.bz2 scummvm-rg350-888930660a5a4bef4fe00e69f267ce0d35492dd8.zip | |
SUPERNOVA: Use setCurrentImage instead of passing the image to renderImage
This is more similar to what the original code does and allows to retire
the renderImage variant that takes an image.
Diffstat (limited to 'engines/supernova/state.cpp')
| -rw-r--r-- | engines/supernova/state.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index d78c45c7e5..11ef049e24 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -760,7 +760,8 @@ void GameManager::supernovaEvent() { _vm->renderMessage(kStringSupernova2); waitOnInput(_timer1); _vm->removeMessage(); - _vm->renderImage(26, 0); + _vm->setCurrentImage(26); + _vm->renderImage(0); _vm->paletteBrightness(); novaScroll(); _vm->paletteFadeOut(); @@ -873,7 +874,8 @@ void GameManager::outro() { _vm->playSoundMod(49); // title = 0; _vm->paletteFadeOut(); - _vm->renderImage(55, 0); + _vm->setCurrentImage(55); + _vm->renderImage(0); _vm->paletteFadeIn(); getInput(); _vm->paletteFadeOut(); @@ -1463,7 +1465,8 @@ void GameManager::closeLocker(const Room *room, Object *obj, Object *lock, int s void GameManager::dead(StringID messageId) { _vm->paletteFadeOut(); _guiEnabled = false; - _vm->renderImage(11, 0); + _vm->setCurrentImage(11); + _vm->renderImage(0); _vm->renderMessage(messageId); _vm->playSound(kAudioDeath); _vm->paletteFadeIn(); @@ -1488,7 +1491,8 @@ void GameManager::dead(StringID messageId) { void GameManager::dead(const char *message) { _vm->paletteFadeOut(); _guiEnabled = false; - _vm->renderImage(11, 0); + _vm->setCurrentImage(11); + _vm->renderImage(0); _vm->renderMessage(message); _vm->playSound(kAudioDeath); _vm->paletteFadeIn(); @@ -1586,7 +1590,8 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) { _vm->renderMessage(kStringGenericInteract_11); waitOnInput(_timer1); _vm->removeMessage(); - _vm->renderImage(2, 0); + _vm->setCurrentImage(2); + _vm->renderImage(0); _vm->setColor63(40); getInput(); _vm->renderRoom(*_currentRoom); |