diff options
author | Jaromir Wysoglad | 2019-07-15 09:20:47 +0200 |
---|---|---|
committer | Thierry Crozat | 2019-07-28 15:09:14 +0100 |
commit | c2177f84539472defe31c6fba80ad4a6f3357266 (patch) | |
tree | 8b586c50ec2c69119d68b58ee4e36adbcb261ec3 /engines/supernova/supernova1 | |
parent | 448db9f4321f5854385e1726284d2ba35c76866f (diff) | |
download | scummvm-rg350-c2177f84539472defe31c6fba80ad4a6f3357266.tar.gz scummvm-rg350-c2177f84539472defe31c6fba80ad4a6f3357266.tar.bz2 scummvm-rg350-c2177f84539472defe31c6fba80ad4a6f3357266.zip |
SUPERNOVA: Merge getInput and waitOnInput methods.
Diffstat (limited to 'engines/supernova/supernova1')
-rw-r--r-- | engines/supernova/supernova1/rooms.cpp | 16 | ||||
-rw-r--r-- | engines/supernova/supernova1/state.cpp | 28 |
2 files changed, 22 insertions, 22 deletions
diff --git a/engines/supernova/supernova1/rooms.cpp b/engines/supernova/supernova1/rooms.cpp index af86450fb8..a419ec9bf9 100644 --- a/engines/supernova/supernova1/rooms.cpp +++ b/engines/supernova/supernova1/rooms.cpp @@ -762,10 +762,10 @@ void ShipSleepCabin::animation() { void ShipSleepCabin::onEntrance() { if (_gm->_state._dream && (_gm->_rooms[CAVE]->getObject(1)->_exitRoom == MEETUP3)) { _vm->renderMessage(kStringShipSleepCabin14); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringShipSleepCabin15); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringShipSleepCabin16); _gm->_state._dream = false; @@ -2084,7 +2084,7 @@ bool ArsanoEntrance::interact(Action verb, Object &obj1, Object &obj2) { _vm->renderMessage(kStringArsanoEntrance20); else { _vm->renderMessage(kStringArsanoEntrance21); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringArsanoEntrance22); _gm->takeObject(*getObject(16)); @@ -2131,7 +2131,7 @@ bool ArsanoEntrance::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[AIRLOCK]->getObject(4)->setProperty(WORN); _gm->_rooms[AIRLOCK]->getObject(5)->setProperty(WORN); _gm->_rooms[AIRLOCK]->getObject(6)->setProperty(WORN); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); } return false; @@ -2445,7 +2445,7 @@ bool ArsanoRoger::interact(Action verb, Object &obj1, Object &obj2) { _vm->_screen->setGuiBrightness(255); _vm->paletteBrightness(); _vm->renderMessage(kStringArsanoRoger39); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); _vm->_screen->setGuiBrightness(0); _vm->paletteBrightness(); @@ -2462,7 +2462,7 @@ bool ArsanoRoger::interact(Action verb, Object &obj1, Object &obj2) { getObject(6)->_click = 7; _vm->paletteFadeIn(); _vm->renderMessage(kStringArsanoRoger40); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); } else return false; @@ -2689,7 +2689,7 @@ bool ArsanoMeetup2::interact(Action verb, Object &obj1, Object &obj2) { _gm->wait(18); _vm->renderMessage(kStringArsanoMeetup2_12); _gm->great(0); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); _vm->paletteFadeOut(); g_system->fillScreen(kColorBlack); @@ -3998,7 +3998,7 @@ bool AxacussElevator::interact(Action verb, Object &obj1, Object &obj2) { _vm->_screen->setGuiBrightness(255); _vm->paletteBrightness(); _vm->renderMessage(kStringAxacussElevator_3); - _gm->waitOnInput(_gm->_messageDuration); + _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); _vm->_screen->setGuiBrightness(0); _vm->paletteBrightness(); diff --git a/engines/supernova/supernova1/state.cpp b/engines/supernova/supernova1/state.cpp index 443053dadc..ee1fe46aa0 100644 --- a/engines/supernova/supernova1/state.cpp +++ b/engines/supernova/supernova1/state.cpp @@ -501,7 +501,7 @@ void GameManager1::telomat(int nr) { _vm->renderRoom(*_currentRoom); _vm->paletteBrightness(); _vm->renderMessage(kStringTelomat17, kMessageTop, name2[i]); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); if (_state._nameSeen[nr]) { Common::String string = _vm->getGameString(kStringTelomat2); @@ -513,7 +513,7 @@ void GameManager1::telomat(int nr) { switch (dialog(3, rows1, dial1, 1)) { case 1: _vm->renderMessage(kStringTelomat18, kMessageTop); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); if ((_state._destination == 255) && !_rooms[BCORRIDOR]->isSectionVisible(7)) { _state._eventTime = _time + ticksToMsec(150); @@ -523,7 +523,7 @@ void GameManager1::telomat(int nr) { } break; case 0: _vm->renderMessage(kStringTelomat19, kMessageTop); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); if (dialog(4, rows2, dial2, 0) != 3) { wait(10); @@ -688,7 +688,7 @@ void GameManager1::supernovaEvent() { CursorMan.showMouse(false); if (_currentRoom->getId() <= CAVE) { _vm->renderMessage(kStringSupernova1); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->paletteFadeOut(); changeRoom(MEETUP); @@ -701,7 +701,7 @@ void GameManager1::supernovaEvent() { _vm->paletteFadeIn(); } _vm->renderMessage(kStringSupernova2); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->setCurrentImage(26); _vm->renderImage(0); @@ -714,23 +714,23 @@ void GameManager1::supernovaEvent() { if (_currentRoom->getId() == GLIDER) { _vm->renderMessage(kStringSupernova3); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->_screen->setGuiBrightness(0); _vm->paletteBrightness(); _vm->renderRoom(*_currentRoom); _vm->paletteFadeIn(); _vm->renderMessage(kStringSupernova4, kMessageTop); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringSupernova5, kMessageTop); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringSupernova6, kMessageTop); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringSupernova7, kMessageTop); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); changeRoom(MEETUP2); _rooms[MEETUP2]->setSectionVisible(1, true); @@ -740,7 +740,7 @@ void GameManager1::supernovaEvent() { _inventory.remove(*(_rooms[ROGER]->getObject(8))); } else { _vm->renderMessage(kStringSupernova8); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->_screen->setGuiBrightness(0); _vm->paletteBrightness(); @@ -1164,10 +1164,10 @@ bool GameManager1::genericInteract(Action verb, Object &obj1, Object &obj2) { saveTime(); _vm->renderMessage(kStringGenericInteract_10); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringGenericInteract_11); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->setCurrentImage(2); _vm->renderImage(0); @@ -1368,7 +1368,7 @@ bool GameManager1::genericInteract(Action verb, Object &obj1, Object &obj2) { _vm->renderMessage(kStringGenericInteract_30); else if ((verb == ACTION_LOOK) && (obj1._id == BOOK2)) { _vm->renderMessage(kStringGenericInteract_31); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringGenericInteract_32); } else |