[Scummvm-git-logs] scummvm master -> 118f6fde0ab13b54e3e49f154b66011a7226a350

tag2015 noreply at scummvm.org
Tue May 2 16:47:44 UTC 2023


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ec981be18 AGS: Disable loading from launcher for offtheclock
118f6fde0a AGS: When quitting with an alertbox, also print error to console


Commit: 8ec981be187649b317574bd97cb54e3848fe310e
    https://github.com/scummvm/scummvm/commit/8ec981be187649b317574bd97cb54e3848fe310e
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-05-02T18:44:32+02:00

Commit Message:
AGS: Disable loading from launcher for offtheclock

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index fdc07488f53..ffe2a859464 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -6863,9 +6863,9 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	GAME_ENTRY_EN("odr3", "ODR3.exe", "af11e94f91b66e11450e8daf51d09292", 7637876),
 	GAME_ENTRY_EN("odr4", "ODR4.exe", "510be04e5eec2aa92bb78b060f138d64", 24227828),
 	GAME_ENTRY_EN("officeshenanigans", "OfficeShenanigans.exe", "25976a689b0f4d73eac69b1728377ecb", 6111931),
-	GAME_ENTRY_EN("offtheclock", "Off The Clock.ags", "8918895c5c695bae90af13ea4f1a9807", 495345700), // Linux
-	GAME_ENTRY_EN("offtheclock", "Off The Clock.exe", "b2eb107c1f9784b7fc4f58c2a7678dea", 498392456), // Windows
-	GAME_ENTRY_EN("offtheclock", "ac2game.dat", "b2eb107c1f9784b7fc4f58c2a7678dea", 498257938), // Mac
+	DETECTION_ENTRY_GUIO("offtheclock", "Off The Clock.ags", "8918895c5c695bae90af13ea4f1a9807", 495345700, Common::EN_ANY, nullptr, GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), nullptr, ADGF_NO_FLAGS),  // Linux
+	DETECTION_ENTRY_GUIO("offtheclock", "Off The Clock.exe", "b2eb107c1f9784b7fc4f58c2a7678dea", 498392456, Common::EN_ANY, nullptr, GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), nullptr, ADGF_NO_FLAGS),  // Win
+	DETECTION_ENTRY_GUIO("offtheclock", "ac2game.dat", "b2eb107c1f9784b7fc4f58c2a7678dea", 498257938, Common::EN_ANY, nullptr, GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), nullptr, ADGF_NO_FLAGS),  // Mac
 	GAME_ENTRY("ohdulieber", "Augustin.exe", "b142b43c146c25443a1d155d441a6a81", 13477896),  // En-Fr-De
 	GAME_ENTRY_EN_PLATFORM("ohdulieber", "Augustin.exe", "b5c41e08919834b549ca350a28f18f87", 12576785, "MAGS"),
 	GAME_ENTRY_EN("ohitschristmas", "soi_c.exe", "0241777c2537fc5d077c05cde10bfa9f", 17522925),


Commit: 118f6fde0ab13b54e3e49f154b66011a7226a350
    https://github.com/scummvm/scummvm/commit/118f6fde0ab13b54e3e49f154b66011a7226a350
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-05-02T18:44:56+02:00

Commit Message:
AGS: When quitting with an alertbox, also print error to console

Minor QoL improvement for easier bug reporting

Changed paths:
    engines/ags/engine/main/quit.cpp


diff --git a/engines/ags/engine/main/quit.cpp b/engines/ags/engine/main/quit.cpp
index 006b26bcd9c..24dc0d219f1 100644
--- a/engines/ags/engine/main/quit.cpp
+++ b/engines/ags/engine/main/quit.cpp
@@ -124,6 +124,7 @@ QuitReason quit_check_for_error_state(const char *qmsg, String &errmsg, String &
 		if (qreason != kQuit_UserAbort) {
 			alertis.AppendFmt("\nError: %s", qmsg);
 			errmsg = qmsg;
+			Debug::Printf(kDbgMsg_Fatal, "ERROR: %s\n%s", qmsg, cc_get_error().CallStack.GetCStr());
 		}
 		return qreason;
 	} else if (qmsg[0] == '%') {




More information about the Scummvm-git-logs mailing list