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

[dreammaster]

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:
e2c352dba1 M4: RIDDLE: Fix leaving inventory close-ups


Commit: e2c352dba11129b466f8f0a2730b22357bab8b34
    https://github.com/scummvm/scummvm/commit/e2c352dba11129b466f8f0a2730b22357bab8b34
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-08T21:28:33-07:00

Commit Message:
M4: RIDDLE: Fix leaving inventory close-ups

Changed paths:
    engines/m4/adv_r/adv_trigger.cpp
    engines/m4/core/rooms.h
    engines/m4/graphics/krn_pal.cpp
    engines/m4/riddle/riddle.cpp
    engines/m4/riddle/vars.h


diff --git a/engines/m4/adv_r/adv_trigger.cpp b/engines/m4/adv_r/adv_trigger.cpp
index 0c1ffae5b0f..5cd70d38f33 100644
--- a/engines/m4/adv_r/adv_trigger.cpp
+++ b/engines/m4/adv_r/adv_trigger.cpp
@@ -99,7 +99,7 @@ bool kernel_trigger_dispatchx(int32 trigger_num) {
 		g_engine->room_parser();
 
 		if (_G(player).command_ready) {
-			g_engine->parser_code();
+			g_engine->global_parser();
 		}
 		result = true;
 		break;
diff --git a/engines/m4/core/rooms.h b/engines/m4/core/rooms.h
index 2f073f297c0..da080d714e0 100644
--- a/engines/m4/core/rooms.h
+++ b/engines/m4/core/rooms.h
@@ -39,7 +39,6 @@ public:
 	virtual void daemon() {}
 	virtual void pre_parser() {}
 	virtual void parser();
-	virtual void parser_code() {}
 	virtual void roomError() {}
 	virtual void shutdown() {}
 
@@ -140,9 +139,6 @@ public:
 	void room_parser() {
 		_activeRoom->parser();
 	}
-	void parser_code() {
-		_activeRoom->parser_code();
-	}
 	void room_error() {
 		_activeRoom->roomError();
 	}
diff --git a/engines/m4/graphics/krn_pal.cpp b/engines/m4/graphics/krn_pal.cpp
index 1b7a0af4365..2e57d888c9b 100644
--- a/engines/m4/graphics/krn_pal.cpp
+++ b/engines/m4/graphics/krn_pal.cpp
@@ -48,7 +48,6 @@ namespace M4 {
 #define NUM_FREE	(IS_RIDDLE ? 255 - 59 + 1 : 255 - 64 + 1)
 
 static HotkeyCB remember_esc_key;
-static HotSpotRec *exam_saved_hotspots;
 
 void krn_pal_game_task() {
 	g_engine->pal_game_task();
@@ -296,7 +295,7 @@ void kernel_examine_inventory_object(const char *picName, RGB8 *pal, int steps,
 
 	interface_hide();
 
-	exam_saved_hotspots = _G(currentSceneDef).hotspots;
+	_GP(exam_saved_hotspots) = _G(currentSceneDef).hotspots;
 	_G(currentSceneDef).hotspots = nullptr;
 
 	_GP(myFadeTrigger) = kernel_trigger_create(triggerNum);
@@ -371,11 +370,9 @@ void kernel_unexamine_inventory_object(RGB8 *pal, int steps, int delay) {
 
 	krn_pal_game_task();
 
-	// set in kernel_examine_inventory_object (above)
+	// Set in kernel_examine_inventory_object (above)
 	kernel_trigger_dispatchx(_GP(myFadeTrigger));
 
-	//	gr_pal_set(master_palette);
-
 	RestoreScreens(0, 0, MAX_VIDEO_X, MAX_VIDEO_Y);
 
 	_G(currentSceneDef).hotspots = _GP(exam_saved_hotspots);
diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index e861829708b..0b25bbed229 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -416,7 +416,7 @@ void RiddleEngine::global_parser() {
 		default:
 			break;
 		}
-	} else if (_G(kernel).trigger == 990) {
+	} else if (_G(kernel).trigger == kINVENTORY_CLOSEUP_END) {
 		if (player_said_any("MENENDEZ'S LETTER", "VON SELTSAM'S LETTER",
 				"ENVELOPE", "VON SELTSAM'S NOTE"))
 			digi_stop(1);
@@ -625,7 +625,7 @@ void RiddleEngine::lookAtInventoryItem() {
 			str = "PING TWELVETREES' MAP";
 	}
 
-	kernel_examine_inventory_object(str.c_str(), 5, 1, 270, 150, 990, digi);
+	kernel_examine_inventory_object(str.c_str(), 5, 1, 270, 150, kINVENTORY_CLOSEUP_END, digi);
 }
 
 } // namespace Riddle
diff --git a/engines/m4/riddle/vars.h b/engines/m4/riddle/vars.h
index 971afce2a66..2d31f6fc5cf 100644
--- a/engines/m4/riddle/vars.h
+++ b/engines/m4/riddle/vars.h
@@ -33,8 +33,7 @@ namespace M4 {
 namespace Riddle {
 
 enum global_triggers {
-	gFIRST_GLOBAL_TRIGGER = 10000,
-
+	kINVENTORY_CLOSEUP_END = 990,
 	kCALLED_EACH_LOOP = 32764,
 	kGOTO_MAIN_MENU = 32766
 };