[Scummvm-git-logs] scummvm master -> 1b9fc31e2d224ea0fba226914f0cf807a1bdfdb5
sev-
sev at scummvm.org
Tue May 12 08:36:46 UTC 2020
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
06242a712b JANITORIAL: Rename EVENT_RTL
581a6ec7d6 JANITORIAL: Rename kSupportsRTL to kSupportsReturnToLauncher
321a02aff2 JANITORIAL: Rename shouldRTL, resetRTL and FORCE_RTL
2f5eb14d4b JANITORIAL: Rename additional RTL references and comments
cc7b06d47a JANITORIAL: Update RTL references in themes and menus
1b9fc31e2d JANITORIAL: Last remaining RTL references
Commit: 06242a712beea03376e89aa3cb271aef3ed31c7a
https://github.com/scummvm/scummvm/commit/06242a712beea03376e89aa3cb271aef3ed31c7a
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-12T10:36:38+02:00
Commit Message:
JANITORIAL: Rename EVENT_RTL
Now that ScummVM is adding RTL support, the EVENT_RTL should be disambigious that it is for returning to launcher
Changed paths:
backends/events/default/default-events.cpp
common/events.h
engines/access/events.cpp
engines/agi/preagi.cpp
engines/agi/preagi_mickey.cpp
engines/agi/preagi_troll.cpp
engines/agi/preagi_winnie.cpp
engines/agos/event.cpp
engines/cine/prc.cpp
engines/cruise/cruise_main.cpp
engines/cryo/cryolib.cpp
engines/dialogs.cpp
engines/draci/draci.cpp
engines/dreamweb/dreamweb.cpp
engines/engine.h
engines/fullpipe/modal.cpp
engines/hopkins/events.cpp
engines/kyra/graphics/vqa.cpp
engines/lab/eventman.cpp
engines/lure/animseq.cpp
engines/lure/events.cpp
engines/mads/events.cpp
engines/mohawk/myst.cpp
engines/parallaction/input.cpp
engines/pink/pink.cpp
engines/plumbers/plumbers.cpp
engines/queen/input.cpp
engines/queen/journal.cpp
engines/saga/introproc_ihnm.cpp
engines/sci/event.cpp
engines/scumm/scumm.cpp
engines/sherlock/events.cpp
engines/sky/intro.cpp
engines/supernova/supernova1/rooms.cpp
engines/supernova/supernova2/rooms.cpp
engines/teenagent/teenagent.cpp
engines/testbed/testsuite.cpp
engines/toltecs/menu.cpp
engines/touche/menu.cpp
engines/tsage/events.cpp
engines/tucker/sequences.cpp
engines/voyeur/events.cpp
engines/wintermute/platform_osystem.cpp
engines/xeen/events.cpp
gui/EventRecorder.cpp
gui/about.cpp
gui/onscreendialog.cpp
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index ed7b8b04b9..1c25b569f1 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 55cfdd190e..e538a61250 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 f610d6e5aa..114ae9dec6 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 ec69c2ea2c..320c53416f 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 c0eca87a64..fa43633a14 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 37e780aef7..a56663e3e7 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 cdf2ba3e49..6a3aa5374b 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 60f0d8ac5c..3c16590aff 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 6c78274a09..55d3504b7e 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 aed7579495..4955c4bd97 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 5b81b9a724..2018a517b1 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 9dab997833..ed9e4c2c27 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 467d5b759a..490eedc537 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 cafe8a50f5..1f80b13101 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 a9e10bc8c8..b9f0d67766 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 615f1e039b..91ce891dbb 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 f840f67ed5..c2a9339397 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 5a4e250b42..40e927db56 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 8242d58c0d..8c6fc4c41b 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 840b349fec..690c3e6f2b 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 9b7e501d55..3ad671211f 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 82e225884f..04afeb14e1 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 8a4e238530..1b426518d1 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 eb54864e76..b314a72ddb 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 4f90f31a23..083286419e 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 5ccf7ee44a..149d9b29b9 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 eb52e3db04..4a49f16e9c 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 4175aa2054..d51d74f452 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 118c292a6e..c7a9357f59 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 9bbea4aec1..c5f3b3ddcc 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 6d205d5571..7a2565f6cb 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 0598710066..39208d45fe 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 2b94f92afc..56d0d4b90b 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 a473a113d7..4981f40903 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 db60a48c35..096855a105 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 c297ffd82b..dbb8fa2d47 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 9b935eddcc..a9f75c5c07 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 b5e35f88f0..ef61222af1 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 b3698f1683..a9e695e8c7 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 1fa17022de..6832dce9ed 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 a9234814d0..57da9a00e9 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 941c3f3a37..313b910dcd 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 4a0d5ee1fc..4bc1702bee 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 eabb7b3a34..d61782556d 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 e5b1cb4701..5a41345858 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 f38d0b4e92..630a522dd4 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 253f88c401..c53265da29 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;
Commit: 581a6ec7d647f1a12d8e08b3ee0d36fcf4e6d69b
https://github.com/scummvm/scummvm/commit/581a6ec7d647f1a12d8e08b3ee0d36fcf4e6d69b
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-12T10:36:38+02:00
Commit Message:
JANITORIAL: Rename kSupportsRTL to kSupportsReturnToLauncher
Changed paths:
engines/access/detection.cpp
engines/adl/adl.cpp
engines/agi/detection.cpp
engines/agos/detection.cpp
engines/bbvs/bbvs.cpp
engines/bladerunner/bladerunner.cpp
engines/cge/cge.cpp
engines/cge2/cge2.cpp
engines/chewy/detection.cpp
engines/cine/detection.cpp
engines/composer/detection.cpp
engines/cruise/cruise.cpp
engines/cryomni3d/detection.cpp
engines/dialogs.cpp
engines/director/detection.cpp
engines/draci/draci.cpp
engines/dragons/dragons.cpp
engines/drascula/drascula.cpp
engines/dreamweb/detection.cpp
engines/engine.h
engines/fullpipe/detection.cpp
engines/glk/detection.cpp
engines/glk/tads/tads.cpp
engines/gnap/detection.cpp
engines/gob/detection/detection.cpp
engines/griffon/detection.cpp
engines/groovie/groovie.cpp
engines/hdb/detection.cpp
engines/hopkins/detection.cpp
engines/hugo/hugo.cpp
engines/illusions/bbdou/illusions_bbdou.cpp
engines/illusions/duckman/illusions_duckman.cpp
engines/kyra/detection.cpp
engines/lab/detection.cpp
engines/lastexpress/lastexpress.cpp
engines/lilliput/lilliput.cpp
engines/lure/detection.cpp
engines/macventure/detection.cpp
engines/made/detection.cpp
engines/mads/detection.cpp
engines/mohawk/detection.cpp
engines/mortevielle/mortevielle.cpp
engines/neverhood/detection.cpp
engines/parallaction/detection.cpp
engines/pegasus/detection.cpp
engines/pink/pink.cpp
engines/prince/detection.cpp
engines/queen/queen.cpp
engines/saga/detection.cpp
engines/sci/detection.cpp
engines/scumm/detection.cpp
engines/sherlock/detection.cpp
engines/sky/detection.cpp
engines/supernova/supernova.cpp
engines/sword1/detection.cpp
engines/sword2/sword2.cpp
engines/sword25/sword25.cpp
engines/teenagent/teenagent.cpp
engines/testbed/testbed.cpp
engines/tinsel/detection.cpp
engines/titanic/detection.cpp
engines/toltecs/detection.cpp
engines/tony/detection.cpp
engines/toon/toon.h
engines/touche/detection.cpp
engines/tsage/tsage.cpp
engines/tucker/tucker.cpp
engines/ultima/shared/engine/ultima.cpp
engines/voyeur/detection.cpp
engines/wage/detection.cpp
engines/wintermute/wintermute.cpp
engines/xeen/detection.cpp
engines/zvision/detection.cpp
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 822d7c98c6..30ca3c0e37 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -120,7 +120,7 @@ bool AccessMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Access::AccessEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 756ce83e68..e6679c9946 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -758,7 +758,7 @@ bool AdlEngine::hasFeature(EngineFeature f) const {
switch (f) {
case kSupportsLoadingDuringRuntime:
case kSupportsSavingDuringRuntime:
- case kSupportsRTL:
+ case kSupportsReturnToLauncher:
return true;
default:
return false;
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index f6895dbd61..fdd904f2d0 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -241,7 +241,7 @@ bool AgiMetaEngine::hasFeature(MetaEngineFeature f) const {
bool AgiBase::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index d6af7b6418..174d3f109b 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -135,7 +135,7 @@ bool AgosMetaEngine::hasFeature(MetaEngineFeature f) const {
bool AGOS::AGOSEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
}
bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index 97db1ac785..8d65a54e47 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -218,7 +218,7 @@ Common::Error BbvsEngine::run() {
bool BbvsEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 23b677320d..31713943fa 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -239,7 +239,7 @@ BladeRunnerEngine::~BladeRunnerEngine() {
bool BladeRunnerEngine::hasFeature(EngineFeature f) const {
return
- f == kSupportsRTL ||
+ f == kSupportsReturnToLauncher ||
f == kSupportsLoadingDuringRuntime ||
f == kSupportsSavingDuringRuntime;
}
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 4e73240447..62881c3fc4 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -241,7 +241,7 @@ Common::Error CGEEngine::run() {
bool CGEEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index df10406d22..d988dda28e 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -183,7 +183,7 @@ void CGE2Engine::deinit() {
bool CGE2Engine::hasFeature(EngineFeature f) const {
return (f == kSupportsLoadingDuringRuntime) || (f == kSupportsSavingDuringRuntime)
- || (f == kSupportsRTL);
+ || (f == kSupportsReturnToLauncher);
}
Common::Error CGE2Engine::run() {
diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp
index e5aa2a2237..0f747e7fb5 100644
--- a/engines/chewy/detection.cpp
+++ b/engines/chewy/detection.cpp
@@ -150,7 +150,7 @@ bool ChewyMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Chewy::ChewyEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 6a808996ff..fdc6bf6cfc 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -107,7 +107,7 @@ bool CineMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Cine::CineEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index f2f4f38674..1cc8a148d6 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -174,7 +174,7 @@ SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
}
bool Composer::ComposerEngine::hasFeature(EngineFeature f) const {
- return (f == kSupportsRTL
+ return (f == kSupportsReturnToLauncher
|| f == kSupportsSavingDuringRuntime
|| f == kSupportsLoadingDuringRuntime);
}
diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp
index b633acc2e4..90552b2662 100644
--- a/engines/cruise/cruise.cpp
+++ b/engines/cruise/cruise.cpp
@@ -76,7 +76,7 @@ CruiseEngine::~CruiseEngine() {
bool CruiseEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp
index 3e9d644952..6a5346b9e1 100644
--- a/engines/cryomni3d/detection.cpp
+++ b/engines/cryomni3d/detection.cpp
@@ -67,7 +67,7 @@ Common::Language CryOmni3DEngine::getLanguage() const {
bool CryOmni3DEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL)
+ (f == kSupportsReturnToLauncher)
|| (f == kSupportsSubtitleOptions);
}
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index ed9e4c2c27..37f0047f61 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -93,7 +93,7 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
_rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _("~R~eturn to Launcher"), 0, kRTLCmd);
else
_rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _c("~R~eturn to Launcher", "lowres"), 0, kRTLCmd);
- _rtlButton->setEnabled(_engine->hasFeature(Engine::kSupportsRTL));
+ _rtlButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher));
if (!g_system->hasFeature(OSystem::kFeatureNoQuit))
new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("~Q~uit"), 0, kQuitCmd);
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 435012520a..52e35829c1 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -63,7 +63,7 @@ Common::String DirectorEngine::getEXEName() const {
bool DirectorEngine::hasFeature(EngineFeature f) const {
return false;
- //(f == kSupportsRTL);
+ //(f == kSupportsReturnToLauncher);
}
} // End of Namespace Director
diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp
index 490eedc537..03ecec72a7 100644
--- a/engines/draci/draci.cpp
+++ b/engines/draci/draci.cpp
@@ -110,7 +110,7 @@ DraciEngine::DraciEngine(OSystem *syst, const ADGameDescription *gameDesc)
bool DraciEngine::hasFeature(EngineFeature f) const {
return (f == kSupportsSubtitleOptions) ||
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index 24ecf1c9a4..ceda9f75c5 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -1216,7 +1216,7 @@ bool DragonsEngine::canSaveGameStateCurrently() {
bool DragonsEngine::hasFeature(Engine::EngineFeature f) const {
return
- // TODO (f == kSupportsRTL) ||
+ // TODO (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index b2a5f87801..460da8e1b3 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -219,7 +219,7 @@ DrasculaEngine::~DrasculaEngine() {
bool DrasculaEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL || f == kSupportsLoadingDuringRuntime || f == kSupportsSavingDuringRuntime);
+ (f == kSupportsReturnToLauncher || f == kSupportsLoadingDuringRuntime || f == kSupportsSavingDuringRuntime);
}
Common::Error DrasculaEngine::run() {
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index dfc68b6146..4bf011754b 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -111,7 +111,7 @@ bool DreamWebMetaEngine::hasFeature(MetaEngineFeature f) const {
bool DreamWeb::DreamWebEngine::hasFeature(EngineFeature f) const {
switch(f) {
- case kSupportsRTL:
+ case kSupportsReturnToLauncher:
return true;
case kSupportsSubtitleOptions:
return _gameDescription->desc.flags & ADGF_CD;
diff --git a/engines/engine.h b/engines/engine.h
index b9f0d67766..5de9b076e1 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -164,7 +164,7 @@ public:
* either directly, or indirectly (that is, the engine calls and honors
* the result of the Engine::shouldQuit() method appropriately).
*/
- kSupportsRTL,
+ kSupportsReturnToLauncher,
/**
* Loading savestates during runtime is supported, that is, this engine
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index 3e75ac3762..9fdcd15458 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -166,7 +166,7 @@ bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Fullpipe::FullpipeEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index 628158f759..b1127d1e61 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -162,7 +162,7 @@ bool GlkMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Glk::GlkEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
@@ -287,7 +287,7 @@ Common::String GlkMetaEngine::findFileByGameId(const Common::String &gameId) con
Common::FSNode folder = Common::FSNode(ConfMan.get("path"));
Common::FSList fslist;
folder.getChildren(fslist, Common::FSNode::kListFilesOnly);
-
+
// Iterate over the files
for (Common::FSList::iterator i = fslist.begin(); i != fslist.end(); ++i) {
// Run a detection on each file in the folder individually
diff --git a/engines/glk/tads/tads.cpp b/engines/glk/tads/tads.cpp
index fc598dbf4a..76f3397f21 100644
--- a/engines/glk/tads/tads.cpp
+++ b/engines/glk/tads/tads.cpp
@@ -36,7 +36,7 @@ TADS::TADS(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gam
bool TADS::hasFeature(EngineFeature f) const {
// The TADS codebases rely on a lot of static globals, so RTL can't be supported
- if (f == kSupportsRTL)
+ if (f == kSupportsReturnToLauncher)
return false;
return GlkAPI::hasFeature(f);
diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp
index 17cf23c8a8..10b7a7438e 100644
--- a/engines/gnap/detection.cpp
+++ b/engines/gnap/detection.cpp
@@ -122,7 +122,7 @@ bool GnapMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Gnap::GnapEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp
index a2c28dadb2..3ab3dbff99 100644
--- a/engines/gob/detection/detection.cpp
+++ b/engines/gob/detection/detection.cpp
@@ -168,7 +168,7 @@ bool GobMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Gob::GobEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
}
Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index 797a483915..b1af1e7532 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -77,7 +77,7 @@ public:
bool Griffon::GriffonEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 335142c1b1..5ecd64eee8 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -346,7 +346,7 @@ Common::Platform GroovieEngine::getPlatform() const {
bool GroovieEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsLoadingDuringRuntime);
}
diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp
index 680c8b1569..49491f9555 100644
--- a/engines/hdb/detection.cpp
+++ b/engines/hdb/detection.cpp
@@ -200,7 +200,7 @@ bool HDBMetaEngine::hasFeature(MetaEngineFeature f) const {
}
bool HDB::HDBGame::hasFeature(Engine::EngineFeature f) const {
- return (f == kSupportsRTL) ||
+ return (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 3398bdfa09..81a3c0c2c0 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -138,7 +138,7 @@ bool HopkinsMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Hopkins::HopkinsEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index e706e9448c..62a1e3e485 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -185,7 +185,7 @@ Common::Error HugoEngine::loadGameState(int slot) {
}
bool HugoEngine::hasFeature(EngineFeature f) const {
- return (f == kSupportsRTL) || (f == kSupportsLoadingDuringRuntime) || (f == kSupportsSavingDuringRuntime);
+ return (f == kSupportsReturnToLauncher) || (f == kSupportsLoadingDuringRuntime) || (f == kSupportsSavingDuringRuntime);
}
const char *HugoEngine::getCopyrightString() const {
diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp
index f03995230a..05b37beed7 100644
--- a/engines/illusions/bbdou/illusions_bbdou.cpp
+++ b/engines/illusions/bbdou/illusions_bbdou.cpp
@@ -259,7 +259,7 @@ Common::Error IllusionsEngine_BBDOU::run() {
bool IllusionsEngine_BBDOU::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index 6e6d31d27a..607ea4e789 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -241,7 +241,7 @@ Common::Error IllusionsEngine_Duckman::run() {
bool IllusionsEngine_Duckman::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 6b345ba7e0..e7d08a13d3 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -198,7 +198,7 @@ bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsSubtitleOptions);
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index 59cbd7c572..d4cdc76967 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -159,7 +159,7 @@ bool LabMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Lab::LabEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 144a474d79..b5527d9514 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -310,7 +310,7 @@ void LastExpressEngine::setEventHandlers(EventHandler::EventFunction *mouse, Eve
/// Misc Engine
///////////////////////////////////////////////////////////////////////////////////
bool LastExpressEngine::hasFeature(EngineFeature f) const {
- return (f == kSupportsRTL);
+ return (f == kSupportsReturnToLauncher);
}
} // End of namespace LastExpress
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index cec5a8417f..5ce305952b 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -305,7 +305,7 @@ void LilliputEngine::newInt8() {
}
bool LilliputEngine::hasFeature(EngineFeature f) const {
- return (f == kSupportsRTL) || (f == kSupportsLoadingDuringRuntime) || (f == kSupportsSavingDuringRuntime);
+ return (f == kSupportsReturnToLauncher) || (f == kSupportsLoadingDuringRuntime) || (f == kSupportsSavingDuringRuntime);
}
const char *LilliputEngine::getCopyrightString() const {
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index dad728eff2..d733728263 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -275,7 +275,7 @@ bool LureMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Lure::LureEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index 1a3695318d..6a3556ac34 100644
--- a/engines/macventure/detection.cpp
+++ b/engines/macventure/detection.cpp
@@ -97,7 +97,7 @@ bool MacVentureMetaEngine::hasFeature(MetaEngineFeature f) const {
bool MacVentureEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index e399f4efb2..f4147b388c 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -84,7 +84,7 @@ bool MadeMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Made::MadeEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
}
bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index d2e57d6734..6cd44c107a 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -191,7 +191,7 @@ bool MADSMetaEngine::hasFeature(MetaEngineFeature f) const {
bool MADS::MADSEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 9bacfc9533..5861066fc0 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -99,7 +99,7 @@ Common::Language MohawkEngine::getLanguage() const {
bool MohawkEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
}
#ifdef ENABLE_MYST
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 642ac2ee2b..1853f33fe4 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -172,7 +172,7 @@ MortevielleEngine::~MortevielleEngine() {
*/
bool MortevielleEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index ceab4fa712..3c839d62ed 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -237,7 +237,7 @@ bool NeverhoodMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Neverhood::NeverhoodEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index fa32a8b018..0c515d2331 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -249,7 +249,7 @@ bool ParallactionMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Parallaction::Parallaction::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
}
bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp
index 29ff26157e..186ad47637 100644
--- a/engines/pegasus/detection.cpp
+++ b/engines/pegasus/detection.cpp
@@ -41,7 +41,7 @@ enum {
bool PegasusEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL)
+ (f == kSupportsReturnToLauncher)
|| (f == kSupportsLoadingDuringRuntime)
|| (f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 083286419e..89da9cd93d 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -278,7 +278,7 @@ bool PinkEngine::canSaveGameStateCurrently() {
bool PinkEngine::hasFeature(Engine::EngineFeature f) const {
return
- f == kSupportsRTL ||
+ f == kSupportsReturnToLauncher ||
f == kSupportsLoadingDuringRuntime ||
f == kSupportsSavingDuringRuntime;
}
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 5d710102d6..57732fcb48 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -188,7 +188,7 @@ bool Prince::PrinceEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime) ||
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
}
SaveStateList PrinceMetaEngine::listSaves(const char *target) const {
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 9a03733e1b..69d1ec4a75 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -312,7 +312,7 @@ void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) {
bool Queen::QueenEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsSubtitleOptions);
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index a8749b0ba9..e74ecb7483 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -151,7 +151,7 @@ bool SagaMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Saga::SagaEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 9c5719ed42..78d5af4cf5 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -800,7 +800,7 @@ bool SciMetaEngine::hasFeature(MetaEngineFeature f) const {
bool SciEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime); // ||
//(f == kSupportsSavingDuringRuntime);
// We can't allow saving through ScummVM menu, because
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 7b78012ac8..dd19e4acfe 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -1003,7 +1003,7 @@ bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const {
bool ScummEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsSubtitleOptions);
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 8b3e9c64bb..5992f41375 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -226,7 +226,7 @@ bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index c65268890f..16275cfe26 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -113,7 +113,7 @@ bool SkyMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Sky::SkyEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 70ede162bb..f731cc8904 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -161,7 +161,7 @@ void SupernovaEngine::init() {
bool SupernovaEngine::hasFeature(EngineFeature f) const {
switch (f) {
- case kSupportsRTL:
+ case kSupportsReturnToLauncher:
return true;
case kSupportsLoadingDuringRuntime:
return true;
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 4188d3d4cf..2f0cf0d3d6 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -115,7 +115,7 @@ bool SwordMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Sword1::SwordEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsLoadingDuringRuntime);
}
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 2fe65edbff..a882710a73 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -117,7 +117,7 @@ bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const {
bool Sword2::Sword2Engine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsSubtitleOptions) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsLoadingDuringRuntime);
diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp
index 9b243fc388..3591fcc864 100644
--- a/engines/sword25/sword25.cpp
+++ b/engines/sword25/sword25.cpp
@@ -195,12 +195,12 @@ bool Sword25Engine::loadPackages() {
bool Sword25Engine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL);
+ (f == kSupportsReturnToLauncher);
// TODO: Implement more of these features?!
#if 0
return
(f == kSupportsSubtitleOptions) ||
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
#endif
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index dbb8fa2d47..6a7951c27c 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -1068,7 +1068,7 @@ void TeenAgentEngine::setMusic(byte id) {
bool TeenAgentEngine::hasFeature(EngineFeature f) const {
switch (f) {
- case kSupportsRTL:
+ case kSupportsReturnToLauncher:
case kSupportsSubtitleOptions:
case kSupportsLoadingDuringRuntime:
case kSupportsSavingDuringRuntime:
diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp
index 7d3d40041d..3216a85a80 100644
--- a/engines/testbed/testbed.cpp
+++ b/engines/testbed/testbed.cpp
@@ -100,7 +100,7 @@ void TestbedExitDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, ui
}
bool TestbedEngine::hasFeature(EngineFeature f) const {
- return (f == kSupportsRTL) ? true : false;
+ return (f == kSupportsReturnToLauncher) ? true : false;
}
TestbedEngine::TestbedEngine(OSystem *syst)
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index c686cad803..744c916fe5 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -130,7 +130,7 @@ bool Tinsel::TinselEngine::hasFeature(EngineFeature f) const {
// global variables (static and non-static) which are never
// explicitly re-initialized when the engine is started
// for a second time.
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
#endif
(f == kSupportsLoadingDuringRuntime);
}
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index dc18c03fd0..9288b1bc34 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -96,7 +96,7 @@ bool TitanicMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Titanic::TitanicEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index d319de4c15..93841619b1 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -271,7 +271,7 @@ bool ToltecsMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Toltecs::ToltecsEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 6ac5dce751..5366e2e6f9 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -102,7 +102,7 @@ bool TonyMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Tony::TonyEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/toon/toon.h b/engines/toon/toon.h
index e1f17c6217..c756d1b62c 100644
--- a/engines/toon/toon.h
+++ b/engines/toon/toon.h
@@ -327,7 +327,7 @@ public:
bool hasFeature(EngineFeature f) const override {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index e0a14ad714..c300b3099e 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -164,7 +164,7 @@ bool ToucheMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Touche::ToucheEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime) ||
(f == kSupportsSubtitleOptions);
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index a6da591f49..fe99c91855 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -65,7 +65,7 @@ TSageEngine::~TSageEngine() {
bool TSageEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 02cd1b6949..986fabd6fc 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -79,7 +79,7 @@ TuckerEngine::~TuckerEngine() {
bool TuckerEngine::hasFeature(EngineFeature f) const {
switch (f) {
- case kSupportsRTL:
+ case kSupportsReturnToLauncher:
case kSupportsLoadingDuringRuntime:
case kSupportsSavingDuringRuntime:
return true;
diff --git a/engines/ultima/shared/engine/ultima.cpp b/engines/ultima/shared/engine/ultima.cpp
index e81365b434..571a98be0c 100644
--- a/engines/ultima/shared/engine/ultima.cpp
+++ b/engines/ultima/shared/engine/ultima.cpp
@@ -74,7 +74,7 @@ void UltimaEngine::GUIError(const Common::String &msg) {
bool UltimaEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index a543260ba6..782f8c1a1a 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -102,7 +102,7 @@ bool VoyeurMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Voyeur::VoyeurEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index b0cfeaefd5..ccecfed9cd 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -87,7 +87,7 @@ bool WageMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Wage::WageEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index b3ea5f5593..02868b2637 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -96,7 +96,7 @@ WintermuteEngine::~WintermuteEngine() {
bool WintermuteEngine::hasFeature(EngineFeature f) const {
switch (f) {
- case kSupportsRTL:
+ case kSupportsReturnToLauncher:
return true;
case kSupportsLoadingDuringRuntime:
return true;
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index 0f87b4f9ed..77258beb33 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -154,7 +154,7 @@ bool XeenMetaEngine::hasFeature(MetaEngineFeature f) const {
bool Xeen::XeenEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 2ad7e2aa40..d97cee5ef4 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -102,7 +102,7 @@ bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {
bool ZVision::ZVision::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL) ||
+ (f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
Commit: 321a02aff204654b53808e706f7df4718ecaf110
https://github.com/scummvm/scummvm/commit/321a02aff204654b53808e706f7df4718ecaf110
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-12T10:36:38+02:00
Commit Message:
JANITORIAL: Rename shouldRTL, resetRTL and FORCE_RTL
Changed paths:
backends/events/default/default-events.cpp
backends/events/default/default-events.h
backends/platform/3ds/osystem-events.cpp
backends/platform/ps2/Makefile.ps2
backends/platform/ps2/Makefile.ps2.dev
base/main.cpp
common/events.h
configure
engines/engine.cpp
engines/sci/event.cpp
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 1c25b569f1..2ff52a004d 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -41,7 +41,7 @@ DefaultEventManager::DefaultEventManager(Common::EventSource *boss) :
_buttonState(0),
_modifierState(0),
_shouldQuit(false),
- _shouldRTL(false),
+ _shouldReturnToLauncher(false),
_confirmExitDialogActive(false) {
assert(boss);
@@ -149,7 +149,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
if (_shouldQuit)
event.type = Common::EVENT_QUIT;
- else if (_shouldRTL)
+ else if (_shouldReturnToLauncher)
event.type = Common::EVENT_RETURN_TO_LAUNCHER;
break;
#ifdef ENABLE_VKEYBD
@@ -174,9 +174,9 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
if (g_engine)
pt = g_engine->pauseEngine();
GUI::MessageDialog alert(_("Do you really want to return to the Launcher?"), _("Launcher"), _("Cancel"));
- forwardEvent = _shouldRTL = (alert.runModal() == GUI::kMessageOK);
+ forwardEvent = _shouldReturnToLauncher = (alert.runModal() == GUI::kMessageOK);
} else
- _shouldRTL = true;
+ _shouldReturnToLauncher = true;
break;
case Common::EVENT_MUTE:
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index f309faf76f..811908d995 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -56,7 +56,7 @@ class DefaultEventManager : public Common::EventManager, Common::EventObserver {
int _buttonState;
int _modifierState;
bool _shouldQuit;
- bool _shouldRTL;
+ bool _shouldReturnToLauncher;
bool _confirmExitDialogActive;
public:
@@ -72,9 +72,9 @@ public:
virtual int getButtonState() const override { return _buttonState; }
virtual int getModifierState() const override { return _modifierState; }
virtual int shouldQuit() const override { return _shouldQuit; }
- virtual int shouldRTL() const override { return _shouldRTL; }
- virtual void resetRTL() override { _shouldRTL = false; }
-#ifdef FORCE_RTL
+ virtual int shouldReturnToLauncher() const override { return _shouldReturnToLauncher; }
+ virtual void resetReturnToLauncher() override { _shouldReturnToLauncher = false; }
+#ifdef FORCE_RETURN_TO_LAUNCHER
virtual void resetQuit() override { _shouldQuit = false; }
#endif
diff --git a/backends/platform/3ds/osystem-events.cpp b/backends/platform/3ds/osystem-events.cpp
index b75955ab29..e9dc1b9426 100644
--- a/backends/platform/3ds/osystem-events.cpp
+++ b/backends/platform/3ds/osystem-events.cpp
@@ -341,7 +341,7 @@ bool OSystem_3DS::pollEvent(Common::Event &event) {
aptMainLoop(); // Call apt hook when necessary
// If magnify mode is on when returning to Launcher, turn it off
- if (_eventManager->shouldRTL()) {
+ if (_eventManager->shouldReturnToLauncher()) {
if (_magnifyMode == MODE_MAGON) {
_magnifyMode = MODE_MAGOFF;
updateSize();
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index 3631c653f6..f328bd4ec9 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -6,7 +6,7 @@
# Scummvm engine config: choose which engines are enabled
ENABLE_AGI = $(ENABLED)
ENABLE_AGOS = $(ENABLED)
-ENABLE_AGOS2 = 1
+ENABLE_AGOS2 = 1
# ENABLE_AVALANCHE = $(ENABLED)
ENABLE_CGE = $(ENABLED)
ENABLE_CINE = $(ENABLED)
@@ -98,7 +98,7 @@ FLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-unused-paramete
CFLAGS = $(FLAGS) -std=c99
CXXFLAGS = $(FLAGS) -Wnon-virtual-dtor -Wno-reorder -fno-exceptions -fno-rtti
-DEFINES = -D_EE -D__PLAYSTATION2__ -D__NEW_PS2SDK__ -DUSE_ZLIB -DFORCE_RTL -DDATA_PATH=\"host:data\"
+DEFINES = -D_EE -D__PLAYSTATION2__ -D__NEW_PS2SDK__ -DUSE_ZLIB -DFORCE_RETURN_TO_LAUNCHER -DDATA_PATH=\"host:data\"
DEFINES += -DDISABLE_SAVEGAME_SORTING -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU
# DEFINES += -DLOGORRHEIC
diff --git a/backends/platform/ps2/Makefile.ps2.dev b/backends/platform/ps2/Makefile.ps2.dev
index cd9432e2df..988c1c9e28 100644
--- a/backends/platform/ps2/Makefile.ps2.dev
+++ b/backends/platform/ps2/Makefile.ps2.dev
@@ -51,7 +51,7 @@ FLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-unused-paramete
CFLAGS = $(FLAGS) -std=c99
CXXFLAGS = $(FLAGS) -Wnon-virtual-dtor -Wno-reorder -fno-exceptions -fno-rtti
-DEFINES = -D_EE -D__PLAYSTATION2__ -D__NEW_PS2SDK__ -DUSE_ZLIB -DFORCE_RTL -DDATA_PATH=\"host:data\"
+DEFINES = -D_EE -D__PLAYSTATION2__ -D__NEW_PS2SDK__ -DUSE_ZLIB -DFORCE_RETURN_TO_LAUNCHER -DDATA_PATH=\"host:data\"
DEFINES += -DDISABLE_SAVEGAME_SORTING -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU
# DEFINES += -DLOGORRHEIC
diff --git a/base/main.cpp b/base/main.cpp
index 063da86bd3..361455f8d8 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -584,13 +584,13 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
}
// Quit unless an error occurred, or Return to launcher was requested
-#ifndef FORCE_RTL
- if (result.getCode() == Common::kNoError && !g_system->getEventManager()->shouldRTL())
+#ifndef FORCE_RETURN_TO_LAUNCHER
+ if (result.getCode() == Common::kNoError && !g_system->getEventManager()->shouldReturnToLauncher())
break;
#endif
// Reset RTL flag in case we want to load another engine
- g_system->getEventManager()->resetRTL();
-#ifdef FORCE_RTL
+ g_system->getEventManager()->resetReturnToLauncher();
+#ifdef FORCE_RETURN_TO_LAUNCHER
g_system->getEventManager()->resetQuit();
#endif
#ifdef ENABLE_EVENTRECORDER
diff --git a/common/events.h b/common/events.h
index e538a61250..35771a00c4 100644
--- a/common/events.h
+++ b/common/events.h
@@ -492,14 +492,14 @@ public:
/**
* Should we return to the launcher?
*/
- virtual int shouldRTL() const = 0;
+ virtual int shouldReturnToLauncher() const = 0;
/**
- * Reset the "return to launcher" flag (as returned shouldRTL()) to false.
+ * Reset the "return to launcher" flag (as returned shouldReturnToLauncher()) to false.
* Used when we have returned to the launcher.
*/
- virtual void resetRTL() = 0;
-#ifdef FORCE_RTL
+ virtual void resetReturnToLauncher() = 0;
+#ifdef FORCE_RETURN_TO_LAUNCHER
virtual void resetQuit() = 0;
#endif
// Optional: check whether a given key is currently pressed ????
diff --git a/configure b/configure
index 3d166e3f48..a2ca0d4256 100755
--- a/configure
+++ b/configure
@@ -3707,7 +3707,7 @@ case $_backend in
;;
ps2)
append_var DEFINES "-D_EE"
- append_var DEFINES "-DFORCE_RTL"
+ append_var DEFINES "-DFORCE_RETURN_TO_LAUNCHER"
append_var INCLUDES "-I$PS2SDK/ee/include"
append_var INCLUDES "-I$PS2SDK/common/include"
append_var INCLUDES "-I$PS2SDK/ports/include"
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 0100385586..c660d69868 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -806,7 +806,7 @@ void Engine::quitGame() {
bool Engine::shouldQuit() {
Common::EventManager *eventMan = g_system->getEventManager();
- return (eventMan->shouldQuit() || eventMan->shouldRTL());
+ return (eventMan->shouldQuit() || eventMan->shouldReturnToLauncher());
}
GUI::Debugger *Engine::getOrCreateDebugger() {
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index c5f3b3ddcc..65f563ea6f 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -425,7 +425,7 @@ void EventManager::updateScreen() {
s->_screenUpdateTime = g_system->getMillis();
// Throttle the checking of shouldQuit() to 60fps as well, since
// Engine::shouldQuit() invokes 2 virtual functions
- // (EventManager::shouldQuit() and EventManager::shouldRTL()),
+ // (EventManager::shouldQuit() and EventManager::shouldReturnToLauncher()),
// which is very expensive to invoke constantly without any
// throttling at all.
if (g_engine->shouldQuit())
Commit: 2f5eb14d4b7fdfd370409b5408a498cda8167bd5
https://github.com/scummvm/scummvm/commit/2f5eb14d4b7fdfd370409b5408a498cda8167bd5
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-12T10:36:38+02:00
Commit Message:
JANITORIAL: Rename additional RTL references and comments
Changed paths:
backends/events/default/default-events.cpp
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
backends/timer/default/default-timer.cpp
base/main.cpp
engines/glk/tads/tads.cpp
engines/kyra/script/script_lol.cpp
engines/kyra/sequence/sequences_lol.cpp
engines/testbed/testsuite.cpp
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 2ff52a004d..3ec5ec4264 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -95,7 +95,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
event = _eventQueue.pop();
bool forwardEvent = true;
- // If the backend has the kFeatureNoQuit, replace Quit event with RTL
+ // If the backend has the kFeatureNoQuit, replace Quit event with Return to Launcher
if (event.type == Common::EVENT_QUIT && g_system->hasFeature(OSystem::kFeatureNoQuit))
event.type = Common::EVENT_RETURN_TO_LAUNCHER;
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 330f219b16..00a8171736 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -390,7 +390,7 @@ OSystem::TransactionError SurfaceSdlGraphicsManager::endGFXTransaction() {
// OSystem_SDL::pollEvent used to update the screen change count,
// but actually it gives problems when a video mode was changed
// but OSystem_SDL::pollEvent was not called. This for example
- // caused a crash under certain circumstances when doing an RTL.
+ // caused a crash under certain circumstances when returning to launcher.
// To fix this issue we update the screen change count right here.
_screenChangeCount++;
}
@@ -406,7 +406,7 @@ OSystem::TransactionError SurfaceSdlGraphicsManager::endGFXTransaction() {
// OSystem_SDL::pollEvent used to update the screen change count,
// but actually it gives problems when a video mode was changed
// but OSystem_SDL::pollEvent was not called. This for example
- // caused a crash under certain circumstances when doing an RTL.
+ // caused a crash under certain circumstances when returning to launcher.
// To fix this issue we update the screen change count right here.
_screenChangeCount++;
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index 067226be4d..e3a82837d7 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -163,7 +163,7 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) {
// callbacks.
//
// Another issues occurs when one plays a game with ALSA as music driver,
- // does RTL and starts a different engine game with ALSA as music driver.
+ // returns to launcher and starts a different engine game with ALSA as music driver.
// In this case the MPU401 code will add different timer procs with the
// same name, resulting in two different callbacks added with the same
// name and causing installTimerProc to error out.
diff --git a/base/main.cpp b/base/main.cpp
index 361455f8d8..3b80eed7d0 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -588,7 +588,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
if (result.getCode() == Common::kNoError && !g_system->getEventManager()->shouldReturnToLauncher())
break;
#endif
- // Reset RTL flag in case we want to load another engine
+ // Reset the return to launcher flag in case we want to load another engine
g_system->getEventManager()->resetReturnToLauncher();
#ifdef FORCE_RETURN_TO_LAUNCHER
g_system->getEventManager()->resetQuit();
diff --git a/engines/glk/tads/tads.cpp b/engines/glk/tads/tads.cpp
index 76f3397f21..d541d2ccb7 100644
--- a/engines/glk/tads/tads.cpp
+++ b/engines/glk/tads/tads.cpp
@@ -35,7 +35,8 @@ TADS::TADS(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gam
}
bool TADS::hasFeature(EngineFeature f) const {
- // The TADS codebases rely on a lot of static globals, so RTL can't be supported
+ // The TADS codebases rely on a lot of static globals,
+ // so return to launcher can't be supported.
if (f == kSupportsReturnToLauncher)
return false;
diff --git a/engines/kyra/script/script_lol.cpp b/engines/kyra/script/script_lol.cpp
index 65d0f6c1e0..e4806ab86f 100644
--- a/engines/kyra/script/script_lol.cpp
+++ b/engines/kyra/script/script_lol.cpp
@@ -1413,7 +1413,7 @@ int LoLEngine::olol_playEndSequence(EMCState *script) {
_screen->getPalette(1).clear();
showOutro(c, (_monsterDifficulty == 2));
- // Don't call quitGame() on a RTL request (because this would
+ // Don't call quitGame() on a return to launcher request (because this would
// make the next game launched from the launcher quit instantly.
if (!shouldQuit())
quitGame();
diff --git a/engines/kyra/sequence/sequences_lol.cpp b/engines/kyra/sequence/sequences_lol.cpp
index 40c16c400d..a4c79bbc53 100644
--- a/engines/kyra/sequence/sequences_lol.cpp
+++ b/engines/kyra/sequence/sequences_lol.cpp
@@ -90,7 +90,7 @@ int LoLEngine::processPrologue() {
switch (selection) {
case -1:
- // This is sent on RTL for example, if we would not have any
+ // This is sent on return to launcher for example, if we would not have any
// special case for this the default path would call quitGame
// and thus make the next game launched from the launcher
// quit instantly.
diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp
index a9f75c5c07..2098ede477 100644
--- a/engines/testbed/testsuite.cpp
+++ b/engines/testbed/testsuite.cpp
@@ -318,8 +318,8 @@ void Testsuite::execute() {
}
updateStats("Test", ((*i)->featureName).c_str(), count, numEnabledTests, pt);
- // TODO: Display a screen here to user with details of upcoming test, he can skip it or Quit or RTL
- // Check if user wants to quit/RTL/Skip next test by parsing events.
+ // TODO: Display a screen here to user with details of upcoming test, he can skip it or Quit or return to launcher
+ // Check if user wants to quit/return to launcher/skip next test by parsing events.
// Quit directly if explicitly requested
if (Engine::shouldQuit()) {
Commit: cc7b06d47a782d96b03e92871d2edced4f763369
https://github.com/scummvm/scummvm/commit/cc7b06d47a782d96b03e92871d2edced4f763369
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-12T10:36:38+02:00
Commit Message:
JANITORIAL: Update RTL references in themes and menus
Changed paths:
dists/bada/Res/scummmobile/scummmobile_layout.stx
engines/dialogs.cpp
engines/dialogs.h
engines/testbed/events.h
gui/themes/default.inc
gui/themes/scummclassic.zip
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummmodern/scummmodern_layout.stx
gui/themes/scummmodern/scummmodern_layout_lowres.stx
gui/themes/scummremastered.zip
gui/themes/scummremastered/remastered_layout.stx
gui/themes/scummremastered/remastered_layout_lowres.stx
diff --git a/dists/bada/Res/scummmobile/scummmobile_layout.stx b/dists/bada/Res/scummmobile/scummmobile_layout.stx
index 5da293a131..96c8926c71 100644
--- a/dists/bada/Res/scummmobile/scummmobile_layout.stx
+++ b/dists/bada/Res/scummmobile/scummmobile_layout.stx
@@ -650,7 +650,7 @@
/>
</layout>
</dialog>
-
+
<dialog name = 'GlobalMenu' overlays = 'screen_center'>
<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'>
<widget name = 'Logo'
@@ -688,7 +688,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '190'
height = 'Globals.Button.Height'
/>
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 37f0047f61..e6277bec52 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -90,10 +90,10 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
new GUI::ButtonWidget(this, "GlobalMenu.About", _("~A~bout"), 0, kAboutCmd);
if (g_system->getOverlayWidth() > 320)
- _rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _("~R~eturn to Launcher"), 0, kRTLCmd);
+ _returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", _("~R~eturn to Launcher"), 0, kLauncherCmd);
else
- _rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _c("~R~eturn to Launcher", "lowres"), 0, kRTLCmd);
- _rtlButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher));
+ _returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", _c("~R~eturn to Launcher", "lowres"), 0, kLauncherCmd);
+ _returnToLauncherButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher));
if (!g_system->hasFeature(OSystem::kFeatureNoQuit))
new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("~Q~uit"), 0, kQuitCmd);
@@ -136,7 +136,7 @@ void MainMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3
dialog.runModal();
}
break;
- case kRTLCmd: {
+ case kLauncherCmd: {
Common::Event eventRTL;
eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER;
g_system->getEventManager()->pushEvent(eventRTL);
@@ -166,9 +166,9 @@ void MainMenuDialog::reflowLayout() {
// FIXME: it might be better to declare GUI::StaticTextWidget::setLabel() virtual
// and to reimplement it in GUI::ButtonWidget to handle the hotkey.
if (g_system->getOverlayWidth() > 320)
- _rtlButton->setLabel(_rtlButton->cleanupHotkey(_("~R~eturn to Launcher")));
+ _returnToLauncherButton->setLabel(_returnToLauncherButton->cleanupHotkey(_("~R~eturn to Launcher")));
else
- _rtlButton->setLabel(_rtlButton->cleanupHotkey(_c("~R~eturn to Launcher", "lowres")));
+ _returnToLauncherButton->setLabel(_returnToLauncherButton->cleanupHotkey(_c("~R~eturn to Launcher", "lowres")));
#ifndef DISABLE_FANCY_THEMES
if (g_gui.xmlEval()->getVar("Globals.ShowGlobalMenuLogo", 0) == 1 && g_gui.theme()->supportsImages()) {
diff --git a/engines/dialogs.h b/engines/dialogs.h
index 5a8e941b5a..620812beea 100644
--- a/engines/dialogs.h
+++ b/engines/dialogs.h
@@ -46,7 +46,7 @@ public:
kHelpCmd = 'HELP',
kAboutCmd = 'ABOU',
kQuitCmd = 'QUIT',
- kRTLCmd = 'RTL ',
+ kLauncherCmd = 'LNCR',
kChooseCmd = 'CHOS'
};
@@ -67,7 +67,7 @@ protected:
GUI::GraphicsWidget *_logo;
- GUI::ButtonWidget *_rtlButton;
+ GUI::ButtonWidget *_returnToLauncherButton;
GUI::ButtonWidget *_loadButton;
GUI::ButtonWidget *_saveButton;
GUI::ButtonWidget *_helpButton;
diff --git a/engines/testbed/events.h b/engines/testbed/events.h
index 96158e002f..3ca1b1e95a 100644
--- a/engines/testbed/events.h
+++ b/engines/testbed/events.h
@@ -56,7 +56,7 @@ public:
return "Events";
}
const char *getDescription() const override {
- return "Events : Keyboard/Mouse/RTL";
+ return "Events : Keyboard/Mouse/Return to Launcher";
}
};
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 386f44e151..a51c5d79a2 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -2057,7 +2057,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"height='Globals.Button.Height' "
"/>"
"<space size='10'/>"
-"<widget name='RTL' "
+"<widget name='ReturnToLauncher' "
"width='150' "
"height='Globals.Button.Height' "
"/>"
@@ -3885,7 +3885,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"width='120' "
"height='12' "
"/>"
-"<widget name='RTL' "
+"<widget name='ReturnToLauncher' "
"width='120' "
"height='12' "
"/>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index b8b9c6aadc..4b8bab5041 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 4c81dbed50..6ec39a7023 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -248,7 +248,7 @@
</layout>
</layout>
</dialog>
-
+
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@@ -1199,7 +1199,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '150'
height = 'Globals.Button.Height'
/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 69f3c53079..1a17d8b251 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -245,7 +245,7 @@
</layout>
</layout>
</dialog>
-
+
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@@ -1209,7 +1209,7 @@
width = '120'
height = '12'
/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '120'
height = '12'
/>
@@ -1831,7 +1831,7 @@
<dialog name = 'DropdownDialog' overlays = 'screen_center' shading = 'luminance'>
</dialog>
-
+
<dialog name = 'UnknownGameDialog' overlays = 'screen' inset = '8' shading = 'dim'>
<layout type = 'vertical' padding = '8, 8, 8, 0'>
<widget name = 'TextContainer'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 95f4fe7626..7260f80282 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index c0da709324..62285d472d 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -1212,7 +1212,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '150'
height = 'Globals.Button.Height'
/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 8584741681..8a2cafc498 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -1208,7 +1208,7 @@
width = '120'
height = 'Globals.Button.Height'
/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '120'
height = 'Globals.Button.Height'
/>
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 481fa0e8ae..d7ff60e7bb 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index c26c06da7e..62285d472d 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -262,7 +262,7 @@
</layout>
</layout>
</dialog>
-
+
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@@ -1212,7 +1212,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '150'
height = 'Globals.Button.Height'
/>
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index 3432ca853c..8a2cafc498 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -243,7 +243,7 @@
</layout>
</layout>
</dialog>
-
+
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@@ -1208,7 +1208,7 @@
width = '120'
height = 'Globals.Button.Height'
/>
- <widget name = 'RTL'
+ <widget name = 'ReturnToLauncher'
width = '120'
height = 'Globals.Button.Height'
/>
Commit: 1b9fc31e2d224ea0fba226914f0cf807a1bdfdb5
https://github.com/scummvm/scummvm/commit/1b9fc31e2d224ea0fba226914f0cf807a1bdfdb5
Author: mataniko (mataniko at gmail.com)
Date: 2020-05-12T10:36:38+02:00
Commit Message:
JANITORIAL: Last remaining RTL references
Changed paths:
engines/dialogs.cpp
gui/EventRecorder.cpp
gui/onscreendialog.cpp
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index e6277bec52..8e42c82758 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -137,9 +137,9 @@ void MainMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3
}
break;
case kLauncherCmd: {
- Common::Event eventRTL;
- eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER;
- g_system->getEventManager()->pushEvent(eventRTL);
+ Common::Event eventReturnToLauncher;
+ eventReturnToLauncher.type = Common::EVENT_RETURN_TO_LAUNCHER;
+ g_system->getEventManager()->pushEvent(eventReturnToLauncher);
close();
}
break;
diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp
index 5a41345858..492b7bc9f4 100644
--- a/gui/EventRecorder.cpp
+++ b/gui/EventRecorder.cpp
@@ -641,9 +641,9 @@ bool EventRecorder::switchMode() {
saveName = Common::String::format("Save %d", emptySlot + 1);
Common::Error status = g_engine->saveGameState(emptySlot, saveName);
if (status.getCode() == Common::kNoError) {
- Common::Event eventRTL;
- eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER;
- g_system->getEventManager()->pushEvent(eventRTL);
+ Common::Event eventReturnToLauncher;
+ eventReturnToLauncher.type = Common::EVENT_RETURN_TO_LAUNCHER;
+ g_system->getEventManager()->pushEvent(eventReturnToLauncher);
}
}
ConfMan.set("record_mode", "", Common::ConfigManager::kTransientDomain);
diff --git a/gui/onscreendialog.cpp b/gui/onscreendialog.cpp
index c53265da29..4504521fa2 100644
--- a/gui/onscreendialog.cpp
+++ b/gui/onscreendialog.cpp
@@ -122,11 +122,11 @@ OnScreenDialog::OnScreenDialog(bool isRecord) : Dialog("OnScreenDialog") {
}
void OnScreenDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
- Common::Event eventRTL;
+ Common::Event eventReturnToLauncher;
switch (cmd) {
case kStopCmd:
- eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER;
- g_system->getEventManager()->pushEvent(eventRTL);
+ eventReturnToLauncher.type = Common::EVENT_RETURN_TO_LAUNCHER;
+ g_system->getEventManager()->pushEvent(eventReturnToLauncher);
close();
break;
case kEditCmd:
More information about the Scummvm-git-logs
mailing list