[Scummvm-git-logs] scummvm master -> 375ba813a52437e1742d65c8ae835bca39625747

[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:
375ba813a5 M4: Fix using Escape key to abort intro cutscenes


Commit: 375ba813a52437e1742d65c8ae835bca39625747
    https://github.com/scummvm/scummvm/commit/375ba813a52437e1742d65c8ae835bca39625747
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-03T20:13:12-08:00

Commit Message:
M4: Fix using Escape key to abort intro cutscenes

Changed paths:
    engines/m4/burger/hotkeys.cpp
    engines/m4/burger/vars.cpp
    engines/m4/burger/vars.h
    engines/m4/riddle/vars.cpp


diff --git a/engines/m4/burger/hotkeys.cpp b/engines/m4/burger/hotkeys.cpp
index 9c66d3b6141..fb44a3f65fe 100644
--- a/engines/m4/burger/hotkeys.cpp
+++ b/engines/m4/burger/hotkeys.cpp
@@ -128,7 +128,7 @@ void Hotkeys::escape_key_pressed(void *, void *) {
 		case 971:
 			// Switch to main menu
 			_G(game).new_section = 9;
-			_G(game).new_room = 901;
+			_G(game).new_room = 903;
 			break;
 
 		case 903:
diff --git a/engines/m4/burger/vars.cpp b/engines/m4/burger/vars.cpp
index dcd184235d6..a2f033c0c89 100644
--- a/engines/m4/burger/vars.cpp
+++ b/engines/m4/burger/vars.cpp
@@ -30,6 +30,7 @@
 #include "m4/gui/gui_sys.h"
 #include "m4/gui/gui_vmng.h"
 #include "m4/mem/mem.h"
+#include "m4/platform/keys.h"
 #include "m4/detection.h"
 #include "m4/m4.h"
 
@@ -128,9 +129,9 @@ void Vars::main_cold_data_init() {
 }
 
 void Vars::global_menu_system_init() {
-	AddSystemHotkey(Common::KEYCODE_ESCAPE, escape_key_pressed);
-	AddSystemHotkey(Common::KEYCODE_F2, cb_F2);
-	AddSystemHotkey(Common::KEYCODE_F3, cb_F3);
+	AddSystemHotkey(KEY_ESCAPE, Hotkeys::escape_key_pressed);
+	AddSystemHotkey(KEY_F2, Hotkeys::saveGame);
+	AddSystemHotkey(KEY_F3, Hotkeys::loadGame);
 
 	if (_interface.init(0, 5, 6, 8, 9))
 		static_cast<Inventory *>(_inventory)->init();
@@ -163,17 +164,5 @@ void Vars::custom_ascii_converter_proc(char *string) {
 	}
 }
 
-void Vars::escape_key_pressed(void *, void *) {
-
-}
-
-void Vars::cb_F2(void *, void *) {
-
-}
-
-void Vars::cb_F3(void *, void *) {
-
-}
-
 } // namespace Burger
 } // namespace M4
diff --git a/engines/m4/burger/vars.h b/engines/m4/burger/vars.h
index 4db3663c017..637d5a8880b 100644
--- a/engines/m4/burger/vars.h
+++ b/engines/m4/burger/vars.h
@@ -84,9 +84,6 @@ enum global_triggers {
 class Vars : public M4::Vars {
 private:
 	static void custom_ascii_converter_proc(char *string);
-	static void escape_key_pressed(void *, void *);
-	static void cb_F2(void *, void *);
-	static void cb_F3(void *, void *);
 
 protected:
 	void main_cold_data_init() override;
diff --git a/engines/m4/riddle/vars.cpp b/engines/m4/riddle/vars.cpp
index 479a456394e..350f5ced4bb 100644
--- a/engines/m4/riddle/vars.cpp
+++ b/engines/m4/riddle/vars.cpp
@@ -67,9 +67,9 @@ void Vars::main_cold_data_init() {
 
 void Vars::global_menu_system_init() {
 /*
-	AddSystemHotkey(Common::KEYCODE_ESCAPE, escape_key_pressed);
-	AddSystemHotkey(Common::KEYCODE_F2, cb_F2);
-	AddSystemHotkey(Common::KEYCODE_F3, cb_F3);
+	AddSystemHotkey(KEY_ESCAPE, escape_key_pressed);
+	AddSystemHotkey(KEY_F2, cb_F2);
+	AddSystemHotkey(KEY_F3, cb_F3);
 
 	if (_interface.init(0, 5, 6, 8, 9))
 		static_cast<Inventory *>(_inventory)->init();