From 29ebd43d2e17ad89961ba39a5d18e9a2943ea0ab Mon Sep 17 00:00:00 2001 From: sluicebox <22204938+sluicebox@users.noreply.github.com> Date: Sat, 17 Aug 2024 17:54:13 -0700 Subject: [PATCH] SCI: Cleanup warning messages --- engines/sci/console.cpp | 2 +- engines/sci/detection.cpp | 4 ++-- engines/sci/engine/scriptdebug.cpp | 2 +- engines/sci/sci.cpp | 2 +- engines/sci/sound/drivers/casio.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index f70bb2da9e4..99cf183dec6 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -304,7 +304,7 @@ void Console::postEnter() { playVideo(*videoDecoder); _engine->_gfxCursor->kernelShow(); } else - warning("Could not play video %s\n", _videoFile.toString(Common::Path::kNativeSeparator).c_str()); + warning("Could not play video %s", _videoFile.toString(Common::Path::kNativeSeparator).c_str()); _videoFile.clear(); _videoFrameDelay = 0; diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 8ff876fd1f2..d2049a29768 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -246,7 +246,7 @@ ADDetectedGame SciMetaEngineDetection::fallbackDetect(const FileMap &allFiles, c if (ConfMan.hasKey("always_run_fallback_detection_extern")) { if (ConfMan.getBool("always_run_fallback_detection_extern") == false) { - warning("SCI: Fallback detection is disabled."); + warning("SCI: Fallback detection is disabled"); return ADDetectedGame(); } } @@ -255,7 +255,7 @@ ADDetectedGame SciMetaEngineDetection::fallbackDetect(const FileMap &allFiles, c if (!enginePlugin) { static bool warn = true; if (warn) { - warning("Engine plugin for SCI not present. Fallback detection is disabled."); + warning("Engine plugin for SCI not present. Fallback detection is disabled"); warn = false; } return ADDetectedGame(); diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 779587229b1..c3d4ba319e2 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -626,7 +626,7 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) { Resource *script = _resMan->findResource(ResourceId(kResourceTypeScript, scriptNumber), false); if (!script) { - warning("dissectScript(): Script not found!\n"); + warning("dissectScript(): Script not found"); return; } diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index e937ed08d52..3feae4168c2 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -384,7 +384,7 @@ Common::Error SciEngine::run() { // we try to find the super class address of the game object, we can't do that earlier const Object *gameObject = segMan->getObject(_gameObjectAddress); if (!gameObject) { - warning("Could not get game object, aborting..."); + warning("Could not get game object, aborting"); return Common::kUnknownError; } diff --git a/engines/sci/sound/drivers/casio.cpp b/engines/sci/sound/drivers/casio.cpp index bfa47cf1a00..80f5aaae74a 100644 --- a/engines/sci/sound/drivers/casio.cpp +++ b/engines/sci/sound/drivers/casio.cpp @@ -397,7 +397,7 @@ MidiPlayer_Casio::~MidiPlayer_Casio() { int MidiPlayer_Casio::open(ResourceManager* resMan) { if (_version < SCI_VERSION_0_LATE || _version > SCI_VERSION_01) { - warning("CASIO: Unsupported SCI version."); + warning("CASIO: Unsupported SCI version"); return -1; }