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/supernova2/state.cpp | |
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/supernova2/state.cpp')
-rw-r--r-- | engines/supernova/supernova2/state.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/supernova/supernova2/state.cpp b/engines/supernova/supernova2/state.cpp index 8f6b8d6c41..26f83ffb4d 100644 --- a/engines/supernova/supernova2/state.cpp +++ b/engines/supernova/supernova2/state.cpp @@ -475,7 +475,7 @@ bool GameManager2::genericInteract(Action verb, Object &obj1, Object &obj2) { _currentRoom == _rooms[CITY2]) { Common::String t = _vm->getGameString(kStringTaxiArrives); _vm->renderMessage(t); - waitOnInput((t.size() + 20) * _vm->_textSpeed / 10); + wait((t.size() + 20) * _vm->_textSpeed / 10, true); _vm->removeMessage(); taxi(); } else @@ -578,7 +578,7 @@ bool GameManager2::genericInteract(Action verb, Object &obj1, Object &obj2) { _vm->setCurrentImage(30); _vm->renderImage(0); //karte_an = true - waitOnInput(100000); + wait(100000, true); //karte_an = false _vm->removeMessage(); _vm->renderRoom(*_currentRoom); @@ -757,7 +757,7 @@ void GameManager2::taxiUnknownDestination() { _vm->renderImage(0); _vm->renderImage(1); _vm->renderImage(4); - waitOnInput(_vm->_textSpeed * 3); + wait(_vm->_textSpeed * 3, true); _vm->renderImage(invertSection(4)); _vm->renderImage(0); _vm->renderImage(1); @@ -774,7 +774,7 @@ void GameManager2::taxiPayment(int price, int destination) { } else if (_state._money < price) { Common::String t = _vm->getGameString(kStringNotEnoughMoney); _vm->renderMessage(t); - waitOnInput((t.size() + 20) * _vm->_textSpeed / 10); + wait((t.size() + 20) * _vm->_textSpeed / 10, true); _vm->removeMessage(); leaveTaxi(); } else { @@ -790,7 +790,7 @@ void GameManager2::taxiPayment(int price, int destination) { _vm->playSound(kAudioTaxiLeaving); while(_vm->_sound->isPlaying()) wait(1); - waitOnInput((t.size() + 20) * _vm->_textSpeed / 10); + wait((t.size() + 20) * _vm->_textSpeed / 10, true); _vm->removeMessage(); _vm->paletteFadeOut(); @@ -804,7 +804,7 @@ void GameManager2::taxiPayment(int price, int destination) { _vm->playSound(kAudioTaxiArriving); while(_vm->_sound->isPlaying()) wait(1); - waitOnInput((t2.size() + 20) * _vm->_textSpeed / 10); + wait((t2.size() + 20) * _vm->_textSpeed / 10, true); _vm->removeMessage(); _vm->paletteFadeOut(); @@ -883,7 +883,7 @@ void GameManager2::taxi() { else { Common::String t = _vm->getGameString(kStringCheater); _vm->renderMessage(t); - waitOnInput((t.size() + 20) * _vm->_textSpeed / 10); + wait((t.size() + 20) * _vm->_textSpeed / 10, true); _vm->removeMessage(); leaveTaxi(); @@ -978,7 +978,7 @@ bool GameManager2::talkRest(int mod1, int mod2, int rest) { void GameManager2::pyramidEnd() { _vm->renderMessage(kStringPyramid0); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->paletteFadeOut(); _vm->loadGame(kSleepAutosaveSlot); @@ -1278,7 +1278,7 @@ void GameManager2::caught() { void GameManager2::caught2() { _vm->renderMessage(kStringMuseum8); _vm->playSound(kAudioCaught); - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _state._sirenOn = false; _mapOn = false; @@ -1359,7 +1359,7 @@ bool GameManager2::crackDoor(int time) { if (_dead) return false; if (_state._alarmOn != _alarmBefore) { - waitOnInput(_messageDuration); + wait(_messageDuration, true); _vm->removeMessage(); _vm->renderMessage(kStringMuseum16); } |