diff options
| author | Joseph-Eugene Winzer | 2018-03-11 23:13:36 +0100 |
|---|---|---|
| committer | Joseph-Eugene Winzer | 2018-04-14 11:45:52 +0200 |
| commit | dc38d6a8cde47e634bc1c869dbbed476ae34017c (patch) | |
| tree | 9dff66a8efec376dd41059249b3ee5de6c2c8b85 /engines/supernova/rooms.cpp | |
| parent | 3c81c61df9647ca00c558b6f4f8e51e8b3f308e9 (diff) | |
| download | scummvm-rg350-dc38d6a8cde47e634bc1c869dbbed476ae34017c.tar.gz scummvm-rg350-dc38d6a8cde47e634bc1c869dbbed476ae34017c.tar.bz2 scummvm-rg350-dc38d6a8cde47e634bc1c869dbbed476ae34017c.zip | |
SUPERNOVA: Renames _timer1 to _messageDuration
Diffstat (limited to 'engines/supernova/rooms.cpp')
| -rw-r--r-- | engines/supernova/rooms.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index 1899fcfd36..ad42a171a2 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -860,10 +860,10 @@ void ShipSleepCabin::animation() { void ShipSleepCabin::onEntrance() { if (_gm->_state._dream && (_gm->_rooms[CAVE]->getObject(1)->_exitRoom == MEETUP3)) { _vm->renderMessage(kStringShipSleepCabin14); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); _vm->renderMessage(kStringShipSleepCabin15); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); _vm->renderMessage(kStringShipSleepCabin16); _gm->_state._dream = false; @@ -1782,7 +1782,7 @@ bool ArsanoEntrance::interact(Action verb, Object &obj1, Object &obj2) { _vm->renderMessage(kStringArsanoEntrance20); else { _vm->renderMessage(kStringArsanoEntrance21); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); _vm->renderMessage(kStringArsanoEntrance22); _gm->takeObject(*getObject(16)); @@ -1829,7 +1829,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->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); } return false; @@ -2100,7 +2100,7 @@ bool ArsanoRoger::interact(Action verb, Object &obj1, Object &obj2) { _vm->_menuBrightness = 255; _vm->paletteBrightness(); _vm->renderMessage(kStringArsanoRoger39); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); _vm->_menuBrightness = 0; _vm->paletteBrightness(); @@ -2117,7 +2117,7 @@ bool ArsanoRoger::interact(Action verb, Object &obj1, Object &obj2) { getObject(6)->_click = 7; _vm->paletteFadeIn(); _vm->renderMessage(kStringArsanoRoger40); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); } else return false; @@ -2297,7 +2297,7 @@ bool ArsanoMeetup2::interact(Action verb, Object &obj1, Object &obj2) { _gm->wait(18); _vm->renderMessage(kStringArsanoMeetup2_12); _gm->great(0); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); _vm->paletteFadeOut(); g_system->fillScreen(kColorBlack); @@ -3210,7 +3210,7 @@ bool AxacussElevator::interact(Action verb, Object &obj1, Object &obj2) { _vm->_menuBrightness = 255; _vm->paletteBrightness(); _vm->renderMessage(kStringAxacussElevator_3); - _gm->waitOnInput(_gm->_timer1); + _gm->waitOnInput(_gm->_messageDuration); _vm->removeMessage(); _vm->_menuBrightness = 0; _vm->paletteBrightness(); |