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

[Strangerke]

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

Summary:
a21b1b94ca M4: RIDDLE: Small cleanup in room 305


Commit: a21b1b94caa843ed2b21ea1792d41b4d6251e0de
    https://github.com/scummvm/scummvm/commit/a21b1b94caa843ed2b21ea1792d41b4d6251e0de
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-06T08:19:21+01:00

Commit Message:
M4: RIDDLE: Small cleanup in room 305

Changed paths:
    engines/m4/riddle/rooms/section3/room305.cpp


diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 1fb26ab3983..6716c23492d 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -164,7 +164,7 @@ void Room305::init() {
 	switch (_G(game).previous_room) {
 	case KERNEL_RESTORING_GAME:
 		if (player_been_here(201)) {
-			_stander = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 494, 278, 73, 0xf00, 1,
+			_stander = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 494, 278, 73, 0xf00, true,
 				triggerMachineByHashCallback, "fl stander");
 			sendWSMessage_10000(1, _stander, _feng3, 1, 1, 400, _feng3, 1, 6, 0);
 			_fengMode = _fengShould = 1;
@@ -576,8 +576,7 @@ void Room305::pre_parser() {
 	const bool lookFlag = player_said_any("look", "look at");
 	const bool takeFlag = player_said("take");
 
-	if (_drawerOpen && !(takeFlag && player_said("turtle treats"))
-			&& !(lookFlag && player_said("turtle treats"))) {
+	if (_drawerOpen && !(takeFlag && player_said("turtle treats")) && !(lookFlag && player_said("turtle treats"))) {
 		player_set_commands_allowed(false);
 		Common::strcpy_s(_G(player).verb, "close");
 		Common::strcpy_s(_G(player).noun, "drawer");
@@ -755,8 +754,7 @@ next2:
 	if (chiselFlag || (takeFlag && player_said("CHISEL"))) {
 		switch (_G(kernel).trigger) {
 		case -1:
-			if ((chiselFlag && inv_player_has(_G(player).verb)) ||
-				(takeFlag && inv_object_is_here(_G(player).noun))) {
+			if ((chiselFlag && inv_player_has(_G(player).verb)) || (takeFlag && inv_object_is_here(_G(player).noun))) {
 				if (chiselFlag) {
 					if (player_said("CHISEL")) {
 						ws_walk(_G(my_walker), 186, 279, nullptr, 1, 10);
@@ -812,8 +810,7 @@ next3:
 	if (caseFlag || (takeFlag && player_said_any("GERMAN BANKNOTE", "REBUS AMULET", "SILVER BUTTERFLY", "POSTAGE STAMP", "STICK AND SHELL MAP"))) {
 		switch (_G(kernel).trigger) {
 		case -1:
-			if ((caseFlag && inv_player_has(_G(player).verb)) ||
-					(takeFlag && inv_object_is_here(_G(player).noun))) {
+			if ((caseFlag && inv_player_has(_G(player).verb)) || (takeFlag && inv_object_is_here(_G(player).noun))) {
 				if (caseFlag) {
 					if (player_said("GERMAN BANKNOTE"))
 						ws_walk(_G(my_walker), 88, 305, nullptr, 1, 10);
@@ -905,8 +902,7 @@ next4:
 		default:
 			break;
 		}
-	} else if (lookFlag && player_said("cartoon") && _G(kernel).trigger >= -1
-			&& _G(kernel).trigger <= 5) {
+	} else if (lookFlag && player_said("cartoon") && _G(kernel).trigger >= -1 && _G(kernel).trigger <= 5) {
 		switch (_G(kernel).trigger) {
 		case -1:
 		case 1: {
@@ -1085,16 +1081,14 @@ next4:
 			_G(flags)[V085] = 1;
 			digi_play("305r16", 1);
 		}
-	} else if (lookFlag && player_said("turtle") &&
-			inv_object_is_here("turtle")) {
+	} else if (lookFlag && player_said("turtle") && inv_object_is_here("turtle")) {
 		if (_G(flags)[V085]) {
 			digi_play("305r16b", 1);
 		} else {
 			_G(flags)[V085] = 1;
 			digi_play("305r16", 1);
 		}
-	} else if (lookFlag && player_said("turtle treats") &&
-			inv_object_is_here("TURTLE TREATS")) {
+	} else if (lookFlag && player_said("turtle treats") && inv_object_is_here("TURTLE TREATS")) {
 		digi_play("305r18", 1);
 	} else if (lookFlag && player_said("drawer")) {
 		digi_play("305r17", 1);
@@ -1277,19 +1271,29 @@ bool Room305::walkToObject() {
 	if (player_said("SHRUNKEN HEAD")) {
 		ws_walk(_G(my_walker), 98, 313, nullptr, 1, 10, true);
 		return true;
-	} else if (player_said("INCENSE BURNER")) {
+	}
+
+	if (player_said("INCENSE BURNER")) {
 		ws_walk(_G(my_walker), 171, 285, nullptr, 1, 10, true);
 		return true;
-	} else if (player_said("CRYSTAL SKULL")) {
+	}
+
+	if (player_said("CRYSTAL SKULL")) {
 		ws_walk(_G(my_walker), 70, 320, nullptr, 1, 10, true);
 		return true;
-	} else if (player_said("WHALE BONE HORN")) {
+	}
+
+	if (player_said("WHALE BONE HORN")) {
 		ws_walk(_G(my_walker), 116, 304, nullptr, 1, 10, true);
 		return true;
-	} else if (player_said("WHEELED TOY")) {
+	}
+
+	if (player_said("WHEELED TOY")) {
 		ws_walk(_G(my_walker), 151, 296, nullptr, 1, 10, true);
 		return true;
-	} else if (player_said("ROMANOV EMERALD")) {
+	}
+
+	if (player_said("ROMANOV EMERALD")) {
 		if (_G(flags)[V090] == 3) {
 			digi_play("305f08", 1, 255, 6);
 			_fengShould = 2;
@@ -1340,22 +1344,21 @@ const char *Room305::getXAreaCartoon() const {
 }
 
 const char *Room305::getXAreaSeries() const {
-	if (_G(flags)[V000]) {
-		static const char *NAMES[9] = {
-			"395car01", "395car08", "395car03", "395car06",
-			"395car05", "395car04", "395car07", "395car02",
-			"395car09"
-		};
-		return NAMES[getXAreaNum() - 1];
+	static const char *NAMES_CARTOONS[9] = {
+		"395car01", "395car08", "395car03", "395car06",
+		"395car05", "395car04", "395car07", "395car02",
+		"395car09"};
 
-	} else {
-		static const char *NAMES[9] = {
-			"jack dempsey", "parrot", "kerosene",
-			"chimney tree", "prof bingo", "blind men",
-			"lemon", "hollow log", "restaurant"
-		};
-		return NAMES[getXAreaNum() - 1];
+	static const char *NAMES_AREA[9] = {
+		"jack dempsey", "parrot", "kerosene",
+		"chimney tree", "prof bingo", "blind men",
+		"lemon", "hollow log", "restaurant"};
+
+	if (_G(flags)[V000]) {
+		return NAMES_CARTOONS[getXAreaNum() - 1];
 	}
+
+	return NAMES_AREA[getXAreaNum() - 1];
 }
 
 Common::String Room305::getXAreaDigi() const {