[Scummvm-git-logs] scummvm branch-3-0 -> bf95d7dde4a28b45903e9d0ce67fcdb38786a777

[Strangerke]

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

Summary:
bd68232ad8 M4: Riddle: Fix for bug #16428 - inventory suitcase being open/close
7e2c95082b M4: Riddle: Fix for bug #16429 - Game suck after looking at Confusius' analects
64cd51cb20 M4: RIDDLE: Fix for ticket #16422 - Duplicate Rebus Amulet hotspot
bf95d7dde4 M4: RIDDLE: Fix for ticket #16427 - losing control on message log


Commit: bd68232ad897e45bc12a6c4773d78bed20717f6f
    https://github.com/scummvm/scummvm/commit/bd68232ad897e45bc12a6c4773d78bed20717f6f
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-04T11:42:54+01:00

Commit Message:
M4: Riddle: Fix for bug #16428 - inventory suitcase being open/close

Changed paths:
    engines/m4/riddle/gui/interface.cpp
    engines/m4/riddle/gui/interface.h


diff --git a/engines/m4/riddle/gui/interface.cpp b/engines/m4/riddle/gui/interface.cpp
index f914eb6f591..0091ff18dca 100644
--- a/engines/m4/riddle/gui/interface.cpp
+++ b/engines/m4/riddle/gui/interface.cpp
@@ -92,7 +92,7 @@ void Interface::setup() {
 	_interfaceBox->add(_btnManipulate);
 	_interfaceBox->add(_btnHandle);
 
-	_btnBackpack = new BackpackClass(RectClass(135, 10, 176, 50), "backpack", 6, 9, 9, 10, INTERFACE_SPRITES);
+	_btnBackpack = new BackpackClass(RectClass(135, 10, 176, 50), "backpack", 6, 10, 10, 9, INTERFACE_SPRITES);
 	_btnBinky = new ButtonClass(RectClass(582, 10, 629, 50), "binky", 8, 11, 13, 12, INTERFACE_SPRITES);
 	_interfaceBox->add(_btnBackpack);
 	_interfaceBox->add(_btnBinky);
@@ -246,6 +246,7 @@ void Interface::trackIcons() {
 		// Backpack
 		mouse_set_sprite(_arrow);
 		_iconSelected = false;
+		_btnBackpack->swap_sprites();
 		_inventory->toggleHidden();
 		_inventory->refresh_scrollbars();
 		break;
diff --git a/engines/m4/riddle/gui/interface.h b/engines/m4/riddle/gui/interface.h
index 520aa1fb5a3..3375ce8d04d 100644
--- a/engines/m4/riddle/gui/interface.h
+++ b/engines/m4/riddle/gui/interface.h
@@ -43,6 +43,14 @@ struct Interface : public M4::Interface {
 			int16 relaxed, int16 over, int16 picked, int sprite) :
 			ButtonClass(r, btnName, tag, relaxed, over, picked, sprite) {}
 		~BackpackClass() override {}
+
+		void swap_sprites() {
+			const int16 picked = _picked;
+			const int16 over = _over;
+
+			_picked = over;
+			_relaxed = _over = picked;
+		}
 	};
 
 private:


Commit: 7e2c95082b9b6d0fa2baa6f80fc31abc6c3358dc
    https://github.com/scummvm/scummvm/commit/7e2c95082b9b6d0fa2baa6f80fc31abc6c3358dc
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-04T11:43:07+01:00

Commit Message:
M4: Riddle: Fix for bug #16429 - Game suck after looking at Confusius' analects

Changed paths:
    engines/m4/riddle/rooms/section2/room204.cpp


diff --git a/engines/m4/riddle/rooms/section2/room204.cpp b/engines/m4/riddle/rooms/section2/room204.cpp
index a66ea75250d..57b14e33b77 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -363,6 +363,7 @@ void Room204::parser() {
 				_fieldE0_x = 555;
 				deleteMeiCheiHotspot();
 				addMovingMeiHotspot();
+				player_set_commands_allowed(true);
 				break;
 
 			default:


Commit: 64cd51cb20e79ad76ad3cafb57c3a5abac4f14ab
    https://github.com/scummvm/scummvm/commit/64cd51cb20e79ad76ad3cafb57c3a5abac4f14ab
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-04T11:43:18+01:00

Commit Message:
M4: RIDDLE: Fix for ticket #16422 - Duplicate Rebus Amulet hotspot

Changed paths:
    engines/m4/riddle/rooms/section2/room207.cpp


diff --git a/engines/m4/riddle/rooms/section2/room207.cpp b/engines/m4/riddle/rooms/section2/room207.cpp
index 05115e5c9d7..6e67316171f 100644
--- a/engines/m4/riddle/rooms/section2/room207.cpp
+++ b/engines/m4/riddle/rooms/section2/room207.cpp
@@ -126,7 +126,7 @@ void Room207::init() {
 		}
 	}
 
-	if (inv_object_is_here("REBUS AMULET")) {
+	if (!inv_object_is_here("REBUS AMULET")) {
 		hotspot_set_active(_G(currentSceneDef).hotspots, "REBUS AMULET", false);
 	} else {
 		_rebusAmuletSeries = series_load("rebus amulet", -1, nullptr);


Commit: bf95d7dde4a28b45903e9d0ce67fcdb38786a777
    https://github.com/scummvm/scummvm/commit/bf95d7dde4a28b45903e9d0ce67fcdb38786a777
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-04T11:43:28+01:00

Commit Message:
M4: RIDDLE: Fix for ticket #16427 - losing control on message log

Changed paths:
    engines/m4/riddle/riddle.cpp


diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index abcc567ffdb..6c12da81f77 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -364,9 +364,10 @@ void RiddleEngine::global_parser() {
 						ws_walk(_G(my_walker), _G(player_info).x, _G(player_info).y, nullptr, 1, 7, true);
 						break;
 					default:
-						player_set_commands_allowed(false);
 						break;
 					}
+
+					player_set_commands_allowed(false);
 				} else {
 					kernel_timing_trigger(1, 2);
 				}