thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPERNOVA: Use setCurrentImage instead of passing the image to renderImage

Browse source 
This is more similar to what the original code does and allows to retire
the renderImage variant that takes an image.
This commit is contained in:
Thierry Crozat 2017-11-16 03:17:44 +00:00
parent 624425077b
commit 888930660a
6 changed files with 168 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/supernova/state.cpp
View file

@ -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);