[Scummvm-git-logs] scummvm master -> 7a28d6eaec7ae9f83b33e4c012864a4f6bce591e

[dreammaster]

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

Summary:
198af6811e MADS: PHANTOM: Fix entering column in box 5
7a28d6eaec MADS: PHANTOM: Fix entering underground from pillar ladder


Commit: 198af6811ef1c808223968579770b861b2f73533
    https://github.com/scummvm/scummvm/commit/198af6811ef1c808223968579770b861b2f73533
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-23T18:33:12+10:00

Commit Message:
MADS: PHANTOM: Fix entering column in box 5

Changed paths:
    engines/mads/madsv2/phantom/rooms/room206.h


diff --git a/engines/mads/madsv2/phantom/rooms/room206.h b/engines/mads/madsv2/phantom/rooms/room206.h
index c0744ef4403..3e9ba65d3f4 100644
--- a/engines/mads/madsv2/phantom/rooms/room206.h
+++ b/engines/mads/madsv2/phantom/rooms/room206.h
@@ -76,7 +76,7 @@ struct Room206Scratch {
 #define PANEL_X                 108
 #define PANEL_Y                 137
 
-#define BEHIND_PANEL_X          67
+#define BEHIND_PANEL_X          60
 #define BEHIND_PANEL_Y          127
 
 #define HIT_HEAD_X              168


Commit: 7a28d6eaec7ae9f83b33e4c012864a4f6bce591e
    https://github.com/scummvm/scummvm/commit/7a28d6eaec7ae9f83b33e4c012864a4f6bce591e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-23T18:43:31+10:00

Commit Message:
MADS: PHANTOM: Fix entering underground from pillar ladder

Changed paths:
    engines/mads/madsv2/core/game.cpp


diff --git a/engines/mads/madsv2/core/game.cpp b/engines/mads/madsv2/core/game.cpp
index a45aa8670b0..40fcd98594d 100644
--- a/engines/mads/madsv2/core/game.cpp
+++ b/engines/mads/madsv2/core/game.cpp
@@ -2233,14 +2233,18 @@ static void game_main_loop() {
 	if ((inter_awaiting == AWAITING_COMMAND) && !mouse_button) {
 		if (inter_spot_class == STROKE_INTERFACE) {
 			id = inter_spot_index - spot_base[STROKE_INTERFACE - 1];
-			if (id < room_num_spots) {
-				id = room_num_spots - (id + 1);
-				cursor_id = room_spots[id].cursor_number;
-			} else {
-				id -= room_num_spots;
-				cursor_id = kernel_dynamic_hot[id].cursor;
+
+			// WORKAROUND: In ROTP entering underground from pillar
+			if (id >= 0) {
+				if (id < room_num_spots) {
+					id = room_num_spots - (id + 1);
+					cursor_id = room_spots[id].cursor_number;
+				} else {
+					id -= room_num_spots;
+					cursor_id = kernel_dynamic_hot[id].cursor;
+				}
+				if (!cursor_id) cursor_id = 1;
 			}
-			if (!cursor_id) cursor_id = 1;
 		}
 	}
 	if (!player.commands_allowed && ((conv_control.running < 0) || conv_control.status == CONV_STATUS_HOLDING))