diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index ed7b8b04b92..1c25b569f14 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -97,7 +97,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { // If the backend has the kFeatureNoQuit, replace Quit event with RTL if (event.type == Common::EVENT_QUIT && g_system->hasFeature(OSystem::kFeatureNoQuit)) - event.type = Common::EVENT_RTL; + event.type = Common::EVENT_RETURN_TO_LAUNCHER; switch (event.type) { case Common::EVENT_KEYDOWN: @@ -150,7 +150,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { if (_shouldQuit) event.type = Common::EVENT_QUIT; else if (_shouldRTL) - event.type = Common::EVENT_RTL; + event.type = Common::EVENT_RETURN_TO_LAUNCHER; break; #ifdef ENABLE_VKEYBD case Common::EVENT_VIRTUAL_KEYBOARD: @@ -168,7 +168,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { } break; #endif - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: if (ConfMan.getBool("confirm_exit")) { PauseToken pt; if (g_engine) diff --git a/common/events.h b/common/events.h index 55cfdd190e3..e538a61250a 100644 --- a/common/events.h +++ b/common/events.h @@ -60,7 +60,7 @@ enum EventType { EVENT_MBUTTONUP = 14, EVENT_MAINMENU = 15, - EVENT_RTL = 16, + EVENT_RETURN_TO_LAUNCHER = 16, EVENT_MUTE = 17, EVENT_QUIT = 10, diff --git a/engines/access/events.cpp b/engines/access/events.cpp index f610d6e5aad..114ae9dec60 100644 --- a/engines/access/events.cpp +++ b/engines/access/events.cpp @@ -148,7 +148,7 @@ void EventsManager::pollEvents(bool skipTimers) { while (g_system->getEventManager()->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return; case Common::EVENT_KEYDOWN: diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index ec69c2ea2c1..320c53416f9 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -193,7 +193,7 @@ int PreAgiEngine::getSelection(SelectionTypes type) { while (!shouldQuit()) { while (_eventMan->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return 0; case Common::EVENT_RBUTTONUP: diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index c0eca87a645..fa43633a14f 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -361,7 +361,7 @@ bool MickeyEngine::getMenuSelRow(MSA_MENU &menu, int *sel0, int *sel1, int iRow) while (!shouldQuit()) { while (_system->getEventManager()->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return 0; case Common::EVENT_MOUSEMOVE: @@ -701,7 +701,7 @@ void MickeyEngine::playSound(ENUM_MSA_SOUND iSound) { if (iSound == IDI_MSA_SND_THEME) { while (_system->getEventManager()->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: case Common::EVENT_LBUTTONUP: case Common::EVENT_RBUTTONUP: @@ -2208,7 +2208,7 @@ void MickeyEngine::waitAnyKey(bool anim) { while (!shouldQuit()) { while (_system->getEventManager()->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: case Common::EVENT_KEYDOWN: case Common::EVENT_LBUTTONUP: diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp index 37e780aef7c..a56663e3e7d 100644 --- a/engines/agi/preagi_troll.cpp +++ b/engines/agi/preagi_troll.cpp @@ -61,7 +61,7 @@ bool TrollEngine::getMenuSel(const char *szMenu, int *iSel, int nSel) { while (!shouldQuit()) { while (_system->getEventManager()->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return 0; case Common::EVENT_MOUSEMOVE: @@ -197,7 +197,7 @@ void TrollEngine::waitAnyKeyIntro() { while (!shouldQuit()) { while (_system->getEventManager()->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: case Common::EVENT_LBUTTONUP: case Common::EVENT_KEYDOWN: diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp index cdf2ba3e49b..6a3aa5374bb 100644 --- a/engines/agi/preagi_winnie.cpp +++ b/engines/agi/preagi_winnie.cpp @@ -818,7 +818,7 @@ void WinnieEngine::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) { while (!shouldQuit()) { while (_system->getEventManager()->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return; case Common::EVENT_MOUSEMOVE: diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 60f0d8ac5c5..3c16590affa 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -518,7 +518,7 @@ void AGOSEngine::delay(uint amount) { case Common::EVENT_RBUTTONUP: _rightClick = true; break; - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return; case Common::EVENT_WHEELUP: diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp index 6c78274a090..55d3504b7ea 100644 --- a/engines/cine/prc.cpp +++ b/engines/cine/prc.cpp @@ -52,7 +52,7 @@ bool loadPrc(const char *pPrcName) { // This is copy protection. Used to hang the machine if (!scumm_stricmp(pPrcName, COPY_PROT_FAIL_PRC_NAME)) { Common::Event event; - event.type = Common::EVENT_RTL; + event.type = Common::EVENT_RETURN_TO_LAUNCHER; g_system->getEventManager()->pushEvent(event); return false; } diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index aed75794959..4955c4bd974 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -1708,7 +1708,7 @@ bool manageEvents() { abortFlag = false; break; case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: _playerDontAskQuit = true; break; case Common::EVENT_KEYUP: diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp index 5b81b9a7242..2018a517b1b 100644 --- a/engines/cryo/cryolib.cpp +++ b/engines/cryo/cryolib.cpp @@ -263,7 +263,7 @@ void CryoEngine::pollEvents() { // Handle keypress switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return; case Common::EVENT_KEYDOWN: diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 9dab997833f..ed9e4c2c272 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -138,7 +138,7 @@ void MainMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3 break; case kRTLCmd: { Common::Event eventRTL; - eventRTL.type = Common::EVENT_RTL; + eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER; g_system->getEventManager()->pushEvent(eventRTL); close(); } diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp index 467d5b759a8..490eedc537f 100644 --- a/engines/draci/draci.cpp +++ b/engines/draci/draci.cpp @@ -357,7 +357,7 @@ void DraciEngine::handleEvents() { } } - // Handle EVENT_QUIT and EVENT_RTL. + // Handle EVENT_QUIT and EVENT_RETURN_TO_LAUNCHER. if (shouldQuit()) { _game->setQuit(true); _script->endCurrentProgram(true); diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index cafe8a50f53..1f80b13101f 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -316,7 +316,7 @@ void DreamWebEngine::processEvents(bool processSoundEvents) { int softKey; while (_eventMan->pollEvent(event)) { switch(event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: quit(); break; case Common::EVENT_KEYDOWN: diff --git a/engines/engine.h b/engines/engine.h index a9e10bc8c84..b9f0d677668 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -160,7 +160,7 @@ public: kSupportsSubtitleOptions, /** - * 'Return to launcher' feature is supported, i.e., EVENT_RTL is handled + * 'Return to launcher' feature is supported, i.e., EVENT_RETURN_TO_LAUNCHER is handled * either directly, or indirectly (that is, the engine calls and honors * the result of the Engine::shouldQuit() method appropriately). */ diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 615f1e039b5..91ce891dbb2 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -372,7 +372,7 @@ static bool checkSkipVideo(const Common::Event &event) { return false; } case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return true; default: return false; diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index f840f67ed5a..c2a9339397b 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -249,7 +249,7 @@ void EventsManager::pollEvents() { // Handle keypress switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return; case Common::EVENT_KEYDOWN: diff --git a/engines/kyra/graphics/vqa.cpp b/engines/kyra/graphics/vqa.cpp index 5a4e250b42b..40e927db566 100644 --- a/engines/kyra/graphics/vqa.cpp +++ b/engines/kyra/graphics/vqa.cpp @@ -636,7 +636,7 @@ void VQAMovie::play() { if (event.kbd.keycode == Common::KEYCODE_ESCAPE) return; break; - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return; default: diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp index 8242d58c0dd..8c6fc4c41b9 100644 --- a/engines/lab/eventman.cpp +++ b/engines/lab/eventman.cpp @@ -123,7 +123,7 @@ void EventManager::processInput() { } break; case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: default: break; } diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp index 840b349fecb..690c3e6f2bc 100644 --- a/engines/lure/animseq.cpp +++ b/engines/lure/animseq.cpp @@ -47,7 +47,7 @@ AnimAbortType AnimationSequence::delay(uint32 milliseconds) { return ABORT_NEXT_SCENE; } else if (events.type() == Common::EVENT_LBUTTONDOWN) { return ABORT_NEXT_SCENE; - } else if ((events.type() == Common::EVENT_QUIT) || (events.type() == Common::EVENT_RTL)) { + } else if ((events.type() == Common::EVENT_QUIT) || (events.type() == Common::EVENT_RETURN_TO_LAUNCHER)) { return ABORT_END_INTRO; } else if (events.type() == Common::EVENT_MAINMENU) { return ABORT_NONE; diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp index 9b7e501d55a..3ad671211f0 100644 --- a/engines/lure/events.cpp +++ b/engines/lure/events.cpp @@ -185,7 +185,7 @@ void Events::waitForPress() { bool keyButton = false; while (!keyButton) { while (pollEvent()) { - if ((_event.type == Common::EVENT_QUIT) || (_event.type == Common::EVENT_RTL)) return; + if ((_event.type == Common::EVENT_QUIT) || (_event.type == Common::EVENT_RETURN_TO_LAUNCHER)) return; else if ((_event.type == Common::EVENT_KEYDOWN) && (_event.kbd.ascii != 0)) keyButton = true; else if ((_event.type == Common::EVENT_LBUTTONDOWN) || diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp index 82e225884f7..04afeb14e12 100644 --- a/engines/mads/events.cpp +++ b/engines/mads/events.cpp @@ -147,7 +147,7 @@ void EventsManager::pollEvents() { // Handle keypress switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return; case Common::EVENT_KEYDOWN: diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 8a4e238530e..1b426518d1e 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -656,7 +656,7 @@ void MohawkEngine_Myst::doFrame() { } break; case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: // Attempt to autosave before exiting saveAutosaveIfEnabled(); break; diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index eb54864e767..b314a72ddb2 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -134,7 +134,7 @@ void Input::readInput() { _mouseButtons = kMouseRightUp; break; - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return; diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp index 4f90f31a23a..083286419e6 100644 --- a/engines/pink/pink.cpp +++ b/engines/pink/pink.cpp @@ -128,7 +128,7 @@ Common::Error Pink::PinkEngine::run() { switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return Common::kNoError; case Common::EVENT_MOUSEMOVE: _actor->onMouseMove(event.mouse); diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp index 5ccf7ee44a2..149d9b29b99 100644 --- a/engines/plumbers/plumbers.cpp +++ b/engines/plumbers/plumbers.cpp @@ -121,7 +121,7 @@ Common::Error PlumbersGame::run() { while (g_system->getEventManager()->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: quit = true; break; diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index eb52e3db04e..4a49f16e9c0 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -116,7 +116,7 @@ void Input::delay(uint amount) { if (_dialogueRunning) _talkQuit = true; break; - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: if (_cutawayRunning) _cutawayQuit = true; diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 4175aa2054d..d51d74f4526 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -82,7 +82,7 @@ void Journal::use() { case Common::EVENT_WHEELDOWN: handleMouseWheel(1); break; - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: return; default: diff --git a/engines/saga/introproc_ihnm.cpp b/engines/saga/introproc_ihnm.cpp index 118c292a6ed..c7a9357f59c 100644 --- a/engines/saga/introproc_ihnm.cpp +++ b/engines/saga/introproc_ihnm.cpp @@ -144,7 +144,7 @@ bool Scene::checkKey() { while (_vm->_eventMan->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: res = true; break; diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp index 9bbea4aec13..c5f3b3ddccd 100644 --- a/engines/sci/event.cpp +++ b/engines/sci/event.cpp @@ -243,7 +243,7 @@ SciEvent EventManager::getScummVMEvent() { return noEvent; } - if (ev.type == Common::EVENT_QUIT || ev.type == Common::EVENT_RTL) { + if (ev.type == Common::EVENT_QUIT || ev.type == Common::EVENT_RETURN_TO_LAUNCHER) { input.type = kSciEventQuit; return input; } diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 6d205d5571c..7a2565f6cba 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -2755,7 +2755,7 @@ bool ScummEngine::startManiac() { // chained game. Common::EventManager *eventMan = g_system->getEventManager(); Common::Event event; - event.type = Common::EVENT_RTL; + event.type = Common::EVENT_RETURN_TO_LAUNCHER; eventMan->pushEvent(event); return true; } else { diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp index 0598710066b..39208d45fe3 100644 --- a/engines/sherlock/events.cpp +++ b/engines/sherlock/events.cpp @@ -202,7 +202,7 @@ void Events::pollEvents() { // Handle events switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return; case Common::EVENT_KEYDOWN: diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 2b94f92afc6..56d0d4b90b0 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -930,7 +930,7 @@ bool Intro::escDelay(uint32 msecs) { if (event.type == Common::EVENT_CUSTOM_ENGINE_ACTION_START) { if (event.customType == kSkyActionSkip) return false; - } else if (event.type == Common::EVENT_QUIT || event.type == Common::EVENT_RTL) { + } else if (event.type == Common::EVENT_QUIT || event.type == Common::EVENT_RETURN_TO_LAUNCHER) { return false; } } diff --git a/engines/supernova/supernova1/rooms.cpp b/engines/supernova/supernova1/rooms.cpp index a473a113d78..4981f40903a 100644 --- a/engines/supernova/supernova1/rooms.cpp +++ b/engines/supernova/supernova1/rooms.cpp @@ -4146,7 +4146,7 @@ void Outro::onEntrance() { _vm->_screen->setViewportBrightness(1); Common::Event event; - event.type = Common::EVENT_RTL; + event.type = Common::EVENT_RETURN_TO_LAUNCHER; _vm->getEventManager()->pushEvent(event); } diff --git a/engines/supernova/supernova2/rooms.cpp b/engines/supernova/supernova2/rooms.cpp index db60a48c352..096855a105a 100644 --- a/engines/supernova/supernova2/rooms.cpp +++ b/engines/supernova/supernova2/rooms.cpp @@ -51,12 +51,12 @@ Intro2::Intro2(SupernovaEngine *vm, GameManager2 *gm) { _objectState[7] = Object(_id, kStringDinosaurHead, kStringDefaultDescription, NULLOBJECT, TAKE, 255, 255, 0); _objectState[8] = Object(_id, kStringKeycard, kStringDefaultDescription, MUSCARD, TAKE, 255, 255, 0); - _introText = - _vm->getGameString(kStringIntro1) + '\0' + - _vm->getGameString(kStringIntro2) + '\0' + - _vm->getGameString(kStringIntro3) + '\0' + - _vm->getGameString(kStringIntro4) + '\0' + - _vm->getGameString(kStringIntro5) + '\0' + + _introText = + _vm->getGameString(kStringIntro1) + '\0' + + _vm->getGameString(kStringIntro2) + '\0' + + _vm->getGameString(kStringIntro3) + '\0' + + _vm->getGameString(kStringIntro4) + '\0' + + _vm->getGameString(kStringIntro5) + '\0' + "^Matthias Neef#" + '\0' + "^Sascha Otterbach#" + '\0' + "^Thomas Mazzoni#" + '\0' + @@ -380,7 +380,7 @@ bool TaxiStand::interact(Action verb, Object &obj1, Object &obj2) { _gm->taxi(); else if ((verb == ACTION_WALK || verb == ACTION_OPEN) && obj1._id == DOOR) _vm->renderMessage(obj1._description); - else + else return false; return true; } @@ -487,7 +487,7 @@ bool Street::interact(Action verb, Object &obj1, Object &obj2) { _gm->wait((text.size() + 20) * _vm->_textSpeed / 10, true); _vm->removeMessage(); return false; - } else + } else return false; return true; } @@ -517,7 +517,7 @@ bool Games::interact(Action verb, Object &obj1, Object &obj2) { } else if (verb == ACTION_LOOK && obj1._id == POSTER) { _gm->_state._taxiPossibility &= ~4; // add culture palace return false; - } else + } else return false; return true; } @@ -635,7 +635,7 @@ bool Cabin2::interact(Action verb, Object &obj1, Object &obj2) { _vm->renderRoom(*this); _gm->drawGUI(); _gm->animationOn(); - } else + } else return false; return true; } @@ -785,7 +785,7 @@ bool Kiosk::interact(Action verb, Object &obj1, Object &obj2) { break; } _gm->drawGUI(); - } else + } else return false; return true; } @@ -932,10 +932,10 @@ bool CulturePalace::interact(Action verb, Object &obj1, Object &obj2) { notEnoughMoney(); _gm->drawGUI(); } - } else + } else notEnoughMoney(); } - } else + } else return false; return true; } @@ -1156,7 +1156,7 @@ bool Checkout::interact(Action verb, Object &obj1, Object &obj2) { break; } } - } else + } else return false; return true; } @@ -1580,7 +1580,7 @@ bool Elevator2::interact(Action verb, Object &obj1, Object &obj2) { if (verb == ACTION_LOOK && obj1._id == DISPLAY) { Common::String format = _vm->getGameString(kStringElevator1); - Common::String display = + Common::String display = Common::String::format(format.c_str(), _gm->_state._elevatorE); _vm->renderMessage(display); } else if (verb == ACTION_PRESS && obj1._id == BELL) { @@ -1681,7 +1681,7 @@ bool Elevator2::interact(Action verb, Object &obj1, Object &obj2) { _vm->renderMessage(kStringElevator62); do { _gm->edit(input, 237, 66, 2); - } while ((_gm->_key.keycode != Common::KEYCODE_RETURN) && + } while ((_gm->_key.keycode != Common::KEYCODE_RETURN) && (_gm->_key.keycode != Common::KEYCODE_ESCAPE) && !_vm->shouldQuit()); _vm->removeMessage(); if (_gm->_key.keycode == Common::KEYCODE_RETURN && input[0] != 0) { @@ -1905,12 +1905,12 @@ Ship::Ship(SupernovaEngine *vm, GameManager2 *gm) { _objectState[5] = Object(_id, kStringCable, kStringCableDescription1, RCABLE, COMBINABLE, 255, 255, 0); _objectState[6] = Object(_id, kStringCable, kStringCableDescription2, CABLE, TAKE | COMBINABLE, 255, 255, 8 + kSectionInvert); - _outroText = - _vm->getGameString(kStringIntro1) + '\0' + - _vm->getGameString(kStringIntro2) + '\0' + - _vm->getGameString(kStringIntro3) + '\0' + - _vm->getGameString(kStringIntro4) + '\0' + - _vm->getGameString(kStringIntro5) + '\0' + + _outroText = + _vm->getGameString(kStringIntro1) + '\0' + + _vm->getGameString(kStringIntro2) + '\0' + + _vm->getGameString(kStringIntro3) + '\0' + + _vm->getGameString(kStringIntro4) + '\0' + + _vm->getGameString(kStringIntro5) + '\0' + "^Matthias Neef#" + '\0' + "^Sascha Otterbach#" + '\0' + "^Thomas Mazzoni#" + '\0' + @@ -1920,13 +1920,13 @@ Ship::Ship(SupernovaEngine *vm, GameManager2 *gm) { "^Rene Kach#" + '\0' + '\233' + '\0'; Common::String waitString = "##################"; - _outroText2 = + _outroText2 = waitString + '\0' + - _vm->getGameString(kStringOutro1) + '\0' + - _vm->getGameString(kStringOutro2) + '\0' + - _vm->getGameString(kStringOutro3) + '\0' + - _vm->getGameString(kStringOutro4) + '\0' + - _vm->getGameString(kStringOutro5) + '\0' + + _vm->getGameString(kStringOutro1) + '\0' + + _vm->getGameString(kStringOutro2) + '\0' + + _vm->getGameString(kStringOutro3) + '\0' + + _vm->getGameString(kStringOutro4) + '\0' + + _vm->getGameString(kStringOutro5) + '\0' + '\233' + '\0'; } @@ -2112,7 +2112,7 @@ void Ship::outro() { for(int i = 0; i < 2; i++) { while (!_vm->shouldQuit()) { _gm->updateEvents(); - + if (!marquee.renderCharacter() || _gm->_mouseClicked || _gm->_keyPressed) break; g_system->updateScreen(); @@ -2123,7 +2123,7 @@ void Ship::outro() { Marquee marquee2(_vm->_screen, Marquee::kMarqueeOutro, _outroText2.c_str()); while (!_vm->shouldQuit()) { _gm->updateEvents(); - + if (!marquee2.renderCharacter() || _gm->_mouseClicked || _gm->_keyPressed) break; g_system->updateScreen(); @@ -2136,7 +2136,7 @@ void Ship::outro() { _gm->wait(1, true); } while (volume > 10 && !_vm->shouldQuit()); Common::Event event; - event.type = Common::EVENT_RTL; + event.type = Common::EVENT_RETURN_TO_LAUNCHER; _vm->getEventManager()->pushEvent(event); } @@ -2773,7 +2773,7 @@ bool PuzzleFront::interact(Action verb, Object &obj1, Object &obj2) { for (int i = 0; i < 15; i++) if (_gm->_state._puzzleTab[i] != i) return true; - + _gm->wait(2); _vm->renderImage(16); for (int i = 1; i < 16; i++) @@ -2786,7 +2786,7 @@ bool PuzzleFront::interact(Action verb, Object &obj1, Object &obj2) { _objectState[2]._id = CORRIDOR; _objectState[2]._description = kStringDefaultDescription; _objectState[2]._click = 0; - + _gm->_rooms[PUZZLE_BEHIND]->setSectionVisible(31, kShownFalse); _gm->_rooms[PUZZLE_BEHIND]->setSectionVisible(26, kShownTrue); _gm->_rooms[PUZZLE_BEHIND]->setSectionVisible(27, kShownTrue); @@ -3350,12 +3350,12 @@ bool HoleRoom::interact(Action verb, Object &obj1, Object &obj2) { if (_gm->move(verb, obj1)) { _gm->passageConstruction(); _gm->_newRoom = true; - } else if (verb == ACTION_USE && - (Object::combine(obj1, obj2, ROPE, G_RIGHT) || + } else if (verb == ACTION_USE && + (Object::combine(obj1, obj2, ROPE, G_RIGHT) || Object::combine(obj1, obj2, ROPE, G_LEFT))) { _vm->renderMessage(kStringPyramid7); - } else if (verb == ACTION_USE && - (Object::combine(obj1, obj2, TKNIFE, G_RIGHT) || + } else if (verb == ACTION_USE && + (Object::combine(obj1, obj2, TKNIFE, G_RIGHT) || Object::combine(obj1, obj2, TKNIFE, G_LEFT))) { _vm->renderMessage(kStringPyramid8); } else if (verb == ACTION_TAKE && obj1._id == ROPE && !(obj1._type & CARRIED)) { @@ -3458,7 +3458,7 @@ bool Floordoor::interact(Action verb, Object &obj1, Object &obj2) { else _gm->_inventory.remove(obj2); _objectState[2]._click = 6; - } else if (verb == ACTION_USE && + } else if (verb == ACTION_USE && (Object::combine(obj1, obj2, TKNIFE, G_RIGHT) || Object::combine(obj1, obj2, TKNIFE, G_LEFT))) { _vm->renderMessage(kStringPyramid8); @@ -3473,7 +3473,7 @@ bool Floordoor::interact(Action verb, Object &obj1, Object &obj2) { _objectState[2]._click = 255; _objectState[3]._click = 7; _objectState[3]._type &= ~COMBINABLE; - } else if (verb == ACTION_USE && + } else if (verb == ACTION_USE && (Object::combine(obj1, obj2, ROPE, G_RIGHT) || Object::combine(obj1, obj2, ROPE, G_LEFT) || Object::combine(obj1, obj2, ROPE, STONES))) { @@ -3825,7 +3825,7 @@ void Museum::animation() { bool Museum::interact(Action verb, Object &obj1, Object &obj2) { if (verb == ACTION_WALK && obj1._id == MUS_STREET) { - if (!_gm->_state._alarmOn && + if (!_gm->_state._alarmOn && !(_gm->_rooms[MUS_ROUND]->getObject(4)->_type & CARRIED)) { _vm->renderMessage(kStringMuseum10); } else { @@ -3836,7 +3836,7 @@ bool Museum::interact(Action verb, Object &obj1, Object &obj2) { _vm->stopSound(); _gm->_state._sirenOn = false; } - } else + } else _vm->renderMessage(kStringMuseum12); _gm->wait(_gm->_messageDuration, true); _vm->removeMessage(); @@ -3912,7 +3912,7 @@ bool MusEntrance::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS11]->getObject(2)->_type |= OPENED; else if (verb == ACTION_CLOSE && obj1._id == DOOR) _gm->_rooms[MUS11]->getObject(2)->_type &= ~OPENED; - else if (verb == ACTION_USE && + else if (verb == ACTION_USE && Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && !(_objectState[0]._type & OPENED)) { if (_gm->crackDoor(20)) { @@ -4090,7 +4090,7 @@ void Mus5::animation() { bool Mus5::interact(Action verb, Object &obj1, Object &obj2) { _gm->museumDoorInteract(verb, obj1, obj2); if (verb == ACTION_USE && - Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && + Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && !(_objectState[1]._type & OPENED)) { if (_gm->crackDoor(50)) { _vm->renderImage(8); @@ -4099,7 +4099,7 @@ bool Mus5::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS6]->setSectionVisible(7, kShownTrue); _vm->playSound(kAudioTaxiOpen); } - } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && + } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && (obj1._type & OPENED)) { _vm->renderImage(8 + kSectionInvert); _objectState[1]._type = EXIT | OPENABLE | CLOSED; @@ -4140,7 +4140,7 @@ void Mus6::animation() { bool Mus6::interact(Action verb, Object &obj1, Object &obj2) { _gm->museumDoorInteract(verb, obj1, obj2); if (verb == ACTION_USE && - Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && + Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && !(_objectState[0]._type & OPENED)) { if (_gm->crackDoor(50)) { _vm->renderImage(7); @@ -4149,7 +4149,7 @@ bool Mus6::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS5]->setSectionVisible(8, kShownTrue); _vm->playSound(kAudioTaxiOpen); } - } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && + } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && (obj1._type & OPENED)) { _vm->renderImage(7 + kSectionInvert); _objectState[0]._type = EXIT | OPENABLE | CLOSED; @@ -4221,7 +4221,7 @@ void Mus8::animation() { bool Mus8::interact(Action verb, Object &obj1, Object &obj2) { _gm->museumDoorInteract(verb, obj1, obj2); if (verb == ACTION_USE && - Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && + Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && !(_objectState[1]._type & OPENED)) { if (_gm->crackDoor(50)) { _vm->renderImage(2); @@ -4230,7 +4230,7 @@ bool Mus8::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS9]->setSectionVisible(1, kShownTrue); _vm->playSound(kAudioTaxiOpen); } - } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && + } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && (obj1._type & OPENED)) { _vm->renderImage(2 + kSectionInvert); _objectState[1]._type = EXIT | OPENABLE | CLOSED; @@ -4268,7 +4268,7 @@ void Mus9::animation() { bool Mus9::interact(Action verb, Object &obj1, Object &obj2) { _gm->museumDoorInteract(verb, obj1, obj2); if (verb == ACTION_USE && - Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && + Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && !(_objectState[0]._type & OPENED)) { if (_gm->crackDoor(50)) { _vm->renderImage(1); @@ -4277,7 +4277,7 @@ bool Mus9::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS8]->setSectionVisible(2, kShownTrue); _vm->playSound(kAudioTaxiOpen); } - } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && + } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && (obj1._type & OPENED)) { _vm->renderImage(1 + kSectionInvert); _objectState[0]._type = EXIT | OPENABLE | CLOSED; @@ -4294,7 +4294,7 @@ bool Mus9::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS_ROUND]->getObject(0)->_type = EXIT | OPENABLE | OPENED; _vm->playSound(kAudioTaxiOpen); } - } else if (verb == ACTION_CLOSE && obj1._id == SMALL_DOOR && + } else if (verb == ACTION_CLOSE && obj1._id == SMALL_DOOR && (obj1._type & OPENED)) { _vm->renderImage(5); setSectionVisible(6, kShownFalse); @@ -4404,7 +4404,7 @@ void MusRound::animation() { bool MusRound::interact(Action verb, Object &obj1, Object &obj2) { if (verb == ACTION_USE && - Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && + Object::combine(obj1, obj2, SP_KEYCARD, ENCRYPTED_DOOR) && !(_objectState[0]._type & OPENED)) { if (_gm->crackDoor(50)) { _vm->renderImage(1); @@ -4412,7 +4412,7 @@ bool MusRound::interact(Action verb, Object &obj1, Object &obj2) { _gm->_rooms[MUS9]->getObject(2)->_type = EXIT | OPENABLE | OPENED; _vm->playSound(kAudioTaxiOpen); } - } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && + } else if (verb == ACTION_CLOSE && obj1._id == ENCRYPTED_DOOR && (obj1._type & OPENED)) { _vm->renderImage(1 + kSectionInvert); _objectState[0]._type = EXIT | OPENABLE | CLOSED; diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index c297ffd82bf..dbb8fa2d478 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -297,7 +297,7 @@ int TeenAgentEngine::skipEvents() const { while (_event->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return -1; case Common::EVENT_MAINMENU: case Common::EVENT_LBUTTONDOWN: @@ -595,7 +595,7 @@ Common::Error TeenAgentEngine::run() { Object *currentObject = scene->findObject(mouse); while (_event->pollEvent(event)) { - if (event.type == Common::EVENT_RTL) + if (event.type == Common::EVENT_RETURN_TO_LAUNCHER) return Common::kNoError; if ((!_sceneBusy && inventory->processEvent(event)) || scene->processEvent(event)) diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp index 9b935eddccf..a9f75c5c078 100644 --- a/engines/testbed/testsuite.cpp +++ b/engines/testbed/testsuite.cpp @@ -218,7 +218,7 @@ uint Testsuite::parseEvents() { break; case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return kEngineQuit; default: diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp index b5e35f88f06..ef61222af16 100644 --- a/engines/toltecs/menu.cpp +++ b/engines/toltecs/menu.cpp @@ -124,7 +124,7 @@ void MenuSystem::handleEvents() { case Common::EVENT_KEYDOWN: handleKeyDown(event.kbd); break; - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: _running = false; break; diff --git a/engines/touche/menu.cpp b/engines/touche/menu.cpp index b3698f16835..a9e695e8c7d 100644 --- a/engines/touche/menu.cpp +++ b/engines/touche/menu.cpp @@ -308,7 +308,7 @@ void ToucheEngine::handleOptions(int forceDisplay) { while (_eventMan->pollEvent(event)) { const Button *button = 0; switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: menuData.quit = true; menuData.exit = true; @@ -472,7 +472,7 @@ int ToucheEngine::displayQuitDialog() { Common::Event event; while (_eventMan->pollEvent(event)) { switch (event.type) { - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_QUIT: quitLoop = true; ret = 1; diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp index 1fa17022de0..6832dce9ed2 100644 --- a/engines/tsage/events.cpp +++ b/engines/tsage/events.cpp @@ -58,7 +58,7 @@ bool EventsClass::pollEvent() { // Handle keypress switch (_event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: break; case Common::EVENT_MOUSEMOVE: diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index a9234814d02..57da9a00e9e 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -585,7 +585,7 @@ void AnimationSequencePlayer::syncTime() { } break; case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: _seqNum = 1; break; default: diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 941c3f3a373..313b910dcd2 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -243,7 +243,7 @@ void EventsManager::pollEvents() { // Handle keypress switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: case Common::EVENT_KEYUP: return; diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp index 4a0d5ee1fcc..4bc1702beea 100644 --- a/engines/wintermute/platform_osystem.cpp +++ b/engines/wintermute/platform_osystem.cpp @@ -115,7 +115,7 @@ void BasePlatform::handleEvent(Common::Event *event) { } break; // Focus-events have been removed (_gameRef->onActivate originally) - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: _gameRef->_quitting = true; break; case Common::EVENT_QUIT: diff --git a/engines/xeen/events.cpp b/engines/xeen/events.cpp index eabb7b3a346..d61782556d9 100644 --- a/engines/xeen/events.cpp +++ b/engines/xeen/events.cpp @@ -81,7 +81,7 @@ void EventsManager::pollEvents() { while (g_system->getEventManager()->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: return; case Common::EVENT_KEYDOWN: addEvent(event.kbd); diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp index e5b1cb4701c..5a413458589 100644 --- a/gui/EventRecorder.cpp +++ b/gui/EventRecorder.cpp @@ -151,7 +151,7 @@ void EventRecorder::processMillis(uint32 &millis, bool skipRecord) { _nextEvent = _playbackFile->getNextEvent(); _timerManager->handler(); } else { - if (_nextEvent.type == Common::EVENT_RTL) { + if (_nextEvent.type == Common::EVENT_RETURN_TO_LAUNCHER) { error("playback:action=stopplayback"); } else { uint32 seconds = _fakeTimer / 1000; @@ -642,7 +642,7 @@ bool EventRecorder::switchMode() { Common::Error status = g_engine->saveGameState(emptySlot, saveName); if (status.getCode() == Common::kNoError) { Common::Event eventRTL; - eventRTL.type = Common::EVENT_RTL; + eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER; g_system->getEventManager()->pushEvent(eventRTL); } } diff --git a/gui/about.cpp b/gui/about.cpp index f38d0b4e92b..630a522dd47 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -473,7 +473,7 @@ void EE::run() { while (g_system->getEventManager()->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: - case Common::EVENT_RTL: + case Common::EVENT_RETURN_TO_LAUNCHER: _shouldQuit = true; break; diff --git a/gui/onscreendialog.cpp b/gui/onscreendialog.cpp index 253f88c401b..c53265da29b 100644 --- a/gui/onscreendialog.cpp +++ b/gui/onscreendialog.cpp @@ -125,7 +125,7 @@ void OnScreenDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat Common::Event eventRTL; switch (cmd) { case kStopCmd: - eventRTL.type = Common::EVENT_RTL; + eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER; g_system->getEventManager()->pushEvent(eventRTL); close(); break;