[Scummvm-git-logs] scummvm master -> 4d6d76b60b2c4cb97249b15c4c569719caf2b954

[AndywinXp]

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:
4d6d76b60b SCUMM: GUI: Implement missing banners for v6 games


Commit: 4d6d76b60b2c4cb97249b15c4c569719caf2b954
    https://github.com/scummvm/scummvm/commit/4d6d76b60b2c4cb97249b15c4c569719caf2b954
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-12-20T22:38:26+01:00

Commit Message:
SCUMM: GUI: Implement missing banners for v6 games

Changed paths:
    engines/scumm/dialogs.cpp
    engines/scumm/gfx_gui.cpp
    engines/scumm/input.cpp


diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index e1553d396c8..f356ec6ffda 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -185,7 +185,10 @@ static const ResString string_map_table_v6[] = {
 	{0, "Music Volume    Low  =========  High"},
 	{0, "Voice Volume    Low  =========  High"},
 	{0, "SFX Volume    Low  =========  High"},
-	{0, "Heap %dK"}
+	{0, "Heap %dK"},
+	{0, "Recalibrating Joystick"},
+	{0, "Joystick Mode"}, // SAMNMAX Floppy
+	{0, "Mouse Mode"}
 };
 
 #pragma mark -
diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 24da7c2b440..53080745650 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -3858,6 +3858,16 @@ const char *ScummEngine_v6::getGUIString(int stringId) {
 	case gsHeap:
 		resStringId = 35;
 		break;
+	case gsRecalJoystick:
+		if (_game.id == GID_SAMNMAX && !strcmp(_game.variant, "Floppy")) {
+			resStringId = 37;
+		} else {
+			resStringId = 36;
+		}
+		break;
+	case gsMouseMode:
+		resStringId = 38;
+		break;
 	default:
 		break;
 	}
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 697f54e2ff8..2f6a10c85ae 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -1120,7 +1120,10 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 		// Also, some of these were originally mapped with the CTRL flag, but they would clash with other
 		// internal ScummVM commands, so they are instead available with the SHIFT flag.
 		if (_game.version < 7 && !isSegaCD) {
-			if (_game.version >= 4 && lastKeyHit.keycode == Common::KEYCODE_j && lastKeyHit.hasFlags(Common::KBD_SHIFT)) {
+			if (_game.version == 6 && lastKeyHit.keycode == Common::KEYCODE_j && lastKeyHit.hasFlags(Common::KBD_CTRL)) {
+				showBannerAndPause(0, 90, getGUIString(gsRecalJoystick));
+				return;
+			} else if (_game.version >= 4 && lastKeyHit.keycode == Common::KEYCODE_j && lastKeyHit.hasFlags(Common::KBD_SHIFT)) {
 				if (_game.version == 4) {
 					showOldStyleBannerAndPause(getGUIString(gsRecalJoystick), 2, 90);
 				} else {
@@ -1129,6 +1132,11 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 				return;
 			}
 
+			if (_game.version == 6 && lastKeyHit.keycode == Common::KEYCODE_n && lastKeyHit.hasFlags(Common::KBD_CTRL)) {
+				showBannerAndPause(0, 90, getGUIString(gsMouseMode));
+				return;
+			}
+
 			if (_game.version >= 4 && lastKeyHit.keycode == Common::KEYCODE_m && lastKeyHit.hasFlags(Common::KBD_SHIFT)) {
 				if (_game.version == 4) {
 					showOldStyleBannerAndPause(getGUIString(gsMouseMode), 2, 90);