[Scummvm-git-logs] scummvm master -> d430a9295b20ea27ec6b8bbc8ed35bcd09fcc0eb

[dreammaster]

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:
9a0215e9c3 AGS: Correctly mark Fatman demo as a demo
d430a9295b AGS: Workaround for crashes in Fatman intro sequence


Commit: 9a0215e9c3fd5e83ef389d35234bb380468e4f62
    https://github.com/scummvm/scummvm/commit/9a0215e9c3fd5e83ef389d35234bb380468e4f62
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-04-13T21:20:22-07:00

Commit Message:
AGS: Correctly mark Fatman demo as a demo

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index f5a5f815d0..007d3dcb46 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -1794,7 +1794,6 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	GAME_ENTRY("tales", "tales.exe", "7b5842e8954354ef6e21dc1837073182", 150969855), // Steam
 	GAME_ENTRY("technobabylon", "technobabylon.exe", "e523535e730f313e1ed9b19b1a9dd228", 447900356), // Steam
 	GAME_ENTRY("technobabylon", "technobabylon.exe", "e523535e730f313e1ed9b19b1a9dd228", 447894701),  // Humble Bundle
-	GAME_ENTRY("theadventuresoffatman", "fatman.exe", "853cef07077feadd0f2ccd55c5bd747b", 56375090),
 	GAME_ENTRY("theadventuresoffatman", "fatman.exe", "6cddccb3744ec5c6af7c398fb7b3b11c", 44449205), // Steam
 	GAME_ENTRY("theantidote", "The Antidote.exe", "4017d881af6467d6aad9183e6e38a261", 325819947),
 	GAME_ENTRY("thebeardinthemirror", "the beard in the mirror.exe", "4d4b6d6e560cf32f440c39f8d3896da5", 40637501), // Steam
@@ -1886,6 +1885,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	DEMO_ENTRY("tales", "tales.exe", "4f6c7ec127e8b0ce077abb357903612f", 112930689), // Steam
 	DEMO_ENTRY("technobabylon", "technobabylon.exe", "e523535e730f313e1ed9b19b1a9dd228", 595787927),
 	DEMO_ENTRY("technobabylon", "technobabylon.exe", "e523535e730f313e1ed9b19b1a9dd228", 59578792),
+	DEMO_ENTRY("theadventuresoffatman", "fatman.exe", "853cef07077feadd0f2ccd55c5bd747b", 56375090),
 	DEMO_ENTRY("theloneloser", "demo (english).exe", "0500aacb6c176d47ac0f8158f055db83", 6082095),
 	DEMO_ENTRY("thesecretsofjesus", "the secrets of jesus.exe", "2e17ab52586ad34b5e597c20a59f60a0", 841450335), // Steam
 	DEMO_ENTRY("thesecretsofjesus", "The secrets of Jesus.ags", "ed790525ab59cfc727a35582731de9c1", 838622031), // itch.io Linux


Commit: d430a9295b20ea27ec6b8bbc8ed35bcd09fcc0eb
    https://github.com/scummvm/scummvm/commit/d430a9295b20ea27ec6b8bbc8ed35bcd09fcc0eb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-04-13T21:20:22-07:00

Commit Message:
AGS: Workaround for crashes in Fatman intro sequence

Changed paths:
    engines/ags/engine/ac/character.cpp


diff --git a/engines/ags/engine/ac/character.cpp b/engines/ags/engine/ac/character.cpp
index 21a7ae2950..6811df1b77 100644
--- a/engines/ags/engine/ac/character.cpp
+++ b/engines/ags/engine/ac/character.cpp
@@ -2386,7 +2386,12 @@ void _displayspeech(const char *texx, int aschar, int xx, int yy, int widd, int
 		if ((speakingChar->view < 0) ||
 		        (speakingChar->loop >= _G(views)[speakingChar->view].numLoops) ||
 		        (_G(views)[speakingChar->view].loops[speakingChar->loop].numFrames < 1)) {
+#if AGS_PLATFORM_SCUMMVM
+			// WORKAROUND: Fix crash in Fatman intro by ignoring invalid speeches
+			return;
+#else
 			quitprintf("Unable to display speech because the character %s has an invalid view frame (View %d, loop %d, frame %d)", speakingChar->scrname, speakingChar->view + 1, speakingChar->loop, speakingChar->frame);
+#endif
 		}
 
 		_G(our_eip) = 1504;
@@ -2627,7 +2632,12 @@ void _displayspeech(const char *texx, int aschar, int xx, int yy, int widd, int
 			if (speakingChar->on && // don't bother checking if character is not visible (also fixes 'Trilby's Notes' legacy game)
 			        ((speakingChar->loop >= _G(views)[speakingChar->view].numLoops) ||
 			         (_G(views)[speakingChar->view].loops[speakingChar->loop].numFrames < 1))) {
+#if AGS_PLATFORM_SCUMMVM
+				// WORKAROUND: Fix crash in Fatman intro by ignoring invalid speeches
+				return;
+#else
 				quitprintf("!Unable to display speech because the character %s has an invalid speech view (View %d, loop %d, frame %d)", speakingChar->scrname, speakingChar->view + 1, speakingChar->loop, speakingChar->frame);
+#endif
 			}
 
 			// set up the speed of the first frame