[Scummvm-git-logs] scummvm master -> 3bb079bc2d8e5961800e34d8c79b5de011bc6570

[dreammaster]

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

Summary:
657a684415 M4: Add guard against moving to invalid rooms in mine
3bb079bc2d M4: Add term_message for mine room entrances


Commit: 657a684415111b2e06ba316c4d9ef5942bde7556
    https://github.com/scummvm/scummvm/commit/657a684415111b2e06ba316c4d9ef5942bde7556
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-07T18:38:34-08:00

Commit Message:
M4: Add guard against moving to invalid rooms in mine

Changed paths:
    engines/m4/burger/rooms/section3/mine.cpp


diff --git a/engines/m4/burger/rooms/section3/mine.cpp b/engines/m4/burger/rooms/section3/mine.cpp
index 135dd7a6eea..f6eb19351d6 100644
--- a/engines/m4/burger/rooms/section3/mine.cpp
+++ b/engines/m4/burger/rooms/section3/mine.cpp
@@ -470,6 +470,7 @@ void Mine::mine_travel_link(int16 takeLink) {
 	_mineRoomInfo = MINE_INFO[mineRoomIndex];		// Get this mine room info
 	_entranceDoor = _mineRoomInfo.door[takeLink];	// Get which door to enter from in new room
 	mineRoomIndex = _mineRoomInfo.link[takeLink];	// Get which link to take
+	assert(mineRoomIndex != -1);
 
 	_mineRoomInfo = MINE_INFO[mineRoomIndex];		// Get new mine room info from new index
 	_presentSceneID = _mineRoomInfo.scene_id;		// Set the scene ID


Commit: 3bb079bc2d8e5961800e34d8c79b5de011bc6570
    https://github.com/scummvm/scummvm/commit/3bb079bc2d8e5961800e34d8c79b5de011bc6570
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-07T18:45:58-08:00

Commit Message:
M4: Add term_message for mine room entrances

Changed paths:
    engines/m4/burger/rooms/section3/mine.cpp


diff --git a/engines/m4/burger/rooms/section3/mine.cpp b/engines/m4/burger/rooms/section3/mine.cpp
index f6eb19351d6..f90e72292e5 100644
--- a/engines/m4/burger/rooms/section3/mine.cpp
+++ b/engines/m4/burger/rooms/section3/mine.cpp
@@ -195,6 +195,10 @@ void Mine::daemon() {
 
 		player_set_commands_allowed(false);
 		ws_walk(ei.home_x, ei.home_y, nullptr, 303, ei.home_facing);
+		term_message("Mine entry %d at (%d,%d) to (%d,%d, %d)",
+			_presentSceneID,
+			ei.offscreen_x, ei.offscreen_y,
+			ei.home_x, ei.home_y, ei.home_facing);
 		break;
 	}