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

[dreammaster]

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

Summary:
c7c5381d09 M4: RIDDLE: Fix getting German banknote


Commit: c7c5381d09fb1e39a1c2183fa355ff46b253bb0f
    https://github.com/scummvm/scummvm/commit/c7c5381d09fb1e39a1c2183fa355ff46b253bb0f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-14T21:45:07-08:00

Commit Message:
M4: RIDDLE: Fix getting German banknote

Changed paths:
    engines/m4/riddle/flags.h
    engines/m4/riddle/rooms/section4/room405.cpp


diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index 5f49c16ea31..4a2c78e38fb 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -373,7 +373,7 @@ enum {
 	V335 = 335,
 	V336 = 336,
 	V337 = 337,
-	V338 = 338,
+	kGermanBanknoteFound = 338,
 	V339 = 339,
 	V340 = 340,
 	V341 = 341,
diff --git a/engines/m4/riddle/rooms/section4/room405.cpp b/engines/m4/riddle/rooms/section4/room405.cpp
index 90c0bea44a6..e4cd1fc28b5 100644
--- a/engines/m4/riddle/rooms/section4/room405.cpp
+++ b/engines/m4/riddle/rooms/section4/room405.cpp
@@ -70,7 +70,7 @@ void Room405::init() {
 		_val9 = 0;
 	}
 
-	if (!_G(flags)[V338] || !inv_object_is_here("GERMAN BANKNOTE"))
+	if (!_G(flags)[kGermanBanknoteFound] || !inv_object_is_here("GERMAN BANKNOTE"))
 		hotspot_set_active("GERMAN BANKNOTE", false);
 
 	_safariShadow = series_load("SAFARI SHADOW 3");
@@ -675,6 +675,14 @@ void Room405::parser() {
 				break;
 			}
 		}
+	} else if (lookFlag && player_said("SOFA")) {
+		if (!_G(flags)[kGermanBanknoteFound] && inv_object_is_here("GERMAN BANKNOTE")) {
+			_G(flags)[kGermanBanknoteFound] = 1;
+			doAction("405r15");
+			hotspot_set_active("GERMAN BANKNOTE", true);
+		} else {
+			doAction("405r12");
+		}
 	} else if (lookFlag && player_said("GERMAN BAKNOTE") && inv_object_is_here("GERMAN BAKNOTE")) {
 		doAction("405r17");
 	} else if (lookFlag && player_said(" ")) {