From 2f5eb14d4b7fdfd370409b5408a498cda8167bd5 Mon Sep 17 00:00:00 2001 From: mataniko Date: Mon, 11 May 2020 08:54:39 -0400 Subject: [PATCH] JANITORIAL: Rename additional RTL references and comments --- backends/events/default/default-events.cpp | 2 +- backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 4 ++-- backends/timer/default/default-timer.cpp | 2 +- base/main.cpp | 2 +- engines/glk/tads/tads.cpp | 3 ++- engines/kyra/script/script_lol.cpp | 2 +- engines/kyra/sequence/sequences_lol.cpp | 2 +- engines/testbed/testsuite.cpp | 4 ++-- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 2ff52a004df..3ec5ec4264c 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 330f219b162..00a81717368 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 067226be4df..e3a82837d74 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 361455f8d88..3b80eed7d03 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 76f3397f21b..d541d2ccb7c 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 65d0f6c1e0d..e4806ab86f1 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 40c16c400d3..a4c79bbc530 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 a9f75c5c078..2098ede477c 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()) {