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

[Strangerke]

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:
d0336f568e M4: RIDDLE: Remove an erroneous check in room 801, try to please his majesty GCC with some other wording of "Fallthrough


Commit: d0336f568e3101dc480363451a76257dc2d3d4ce
    https://github.com/scummvm/scummvm/commit/d0336f568e3101dc480363451a76257dc2d3d4ce
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-13T02:18:54+01:00

Commit Message:
M4: RIDDLE: Remove an erroneous check in room 801, try to please his majesty GCC with some other wording of "Fallthrough"

Changed paths:
    engines/m4/riddle/rooms/section8/room801.cpp


diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index f9e5b2f6155..d67d2b2369e 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -128,7 +128,7 @@ void Room801::init() {
 		_roomStates_field9Eh = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 1280, 0, triggerMachineByHashCallback, "mc talk frames");
 		_roomStates_fieldA2h = series_show("SAFARI SHADOW 5", 1280, 16, -1, -1, 0, 50, 124, 304);
 		sendWSMessage_10000(1, _roomStates_field9Eh, _roomStates_field782, 42, 42, 0, _roomStates_field782, 42, 42, 0);
-	} else if (_G(game).previous_room < 850) {
+	} else {
 		ws_demand_facing(_G(my_walker), 8);
 		ws_demand_location(_G(my_walker), 525, 301);
 		_roomStates_loop3 = series_load("rip returns from root cellar", -1, nullptr);
@@ -997,7 +997,7 @@ void Room801::daemon() {
 			switch (_roomStates_pu) {
 			case 4:
 				_roomStates_pu = 1;
-				// Fallthrough on purpose
+				// Fallthrough
 			case 1:
 			case 2:
 			case 3:
@@ -1060,7 +1060,7 @@ void Room801::daemon() {
 			switch (_roomStates_ripTalker) {
 			case 3:
 				_roomStates_ripTalker = 1;
-				// Fallthrough on purpose
+				// Fallthrough
 			case 1:
 			case 2:
 			case 4: