[Scummvm-git-logs] scummvm master -> 5e5ec0b9cd07e2c49f83ab9af32134b27c77d443

[neuromancer]

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:
5e5ec0b9cd FREESCAPE: split change mode and skip actions


Commit: 5e5ec0b9cd07e2c49f83ab9af32134b27c77d443
    https://github.com/scummvm/scummvm/commit/5e5ec0b9cd07e2c49f83ab9af32134b27c77d443
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-08-19T10:33:33+02:00

Commit Message:
FREESCAPE: split change mode and skip actions

Changed paths:
    engines/freescape/freescape.cpp
    engines/freescape/freescape.h
    engines/freescape/games/castle/castle.cpp
    engines/freescape/movement.cpp
    engines/freescape/ui.cpp


diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 49231f19b1f..225029a5475 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -554,7 +554,7 @@ void FreescapeEngine::processInput() {
 				delete _savedScreen;
 				_savedScreen = nullptr;
 				break;
-			case kActionChangeModeOrSkip:
+			case kActionChangeMode:
 				_shootMode = !_shootMode;
 				centerCrossair();
 				if (!_shootMode) {
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index a3a62683504..c4da4d643b9 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -74,7 +74,8 @@ enum FREESCAPEAction {
 	kActionToggleRiseLower,
 	kActionRiseOrFlyUp,
 	kActionLowerOrFlyDown,
-	kActionChangeModeOrSkip,
+	kActionChangeMode,
+	kActionSkip,
 	kActionFaceForward,
 	kActionRotateUp,
 	kActionRotateDown,
diff --git a/engines/freescape/games/castle/castle.cpp b/engines/freescape/games/castle/castle.cpp
index e718ddfb6f7..2aa1839d486 100644
--- a/engines/freescape/games/castle/castle.cpp
+++ b/engines/freescape/games/castle/castle.cpp
@@ -522,7 +522,7 @@ void CastleEngine::drawFullscreenRiddleAndWait(uint16 riddle) {
 			// Events
 			switch (event.type) {
 			case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
-				if (event.customType == kActionChangeModeOrSkip) {
+				if (event.customType == kActionSkip) {
 					cont = false;
 				}
 				break;
diff --git a/engines/freescape/movement.cpp b/engines/freescape/movement.cpp
index abd70cf5eb7..9cb5ede2646 100644
--- a/engines/freescape/movement.cpp
+++ b/engines/freescape/movement.cpp
@@ -79,8 +79,15 @@ void FreescapeEngine::initKeymaps(Common::Keymap *engineKeyMap, Common::Keymap *
 	act->addDefaultInputMapping("l");
 	engineKeyMap->addAction(act);
 
-	act = new Common::Action("SWITCH", _("Change mode/Skip"));
-	act->setCustomEngineActionEvent(kActionChangeModeOrSkip);
+	act = new Common::Action("SKIP", _("Skip"));
+	act->setCustomEngineActionEvent(kActionSkip);
+	act->addDefaultInputMapping("SPACE");
+	act->addDefaultInputMapping("RETURN");
+	act->addDefaultInputMapping("JOY_X");
+	engineKeyMap->addAction(act);
+
+	act = new Common::Action("SWITCH", _("Change mode"));
+	act->setCustomEngineActionEvent(kActionChangeMode);
 	act->addDefaultInputMapping("SPACE");
 	act->addDefaultInputMapping("JOY_X");
 	engineKeyMap->addAction(act);
diff --git a/engines/freescape/ui.cpp b/engines/freescape/ui.cpp
index 96bc2121632..4c4a2a7854f 100644
--- a/engines/freescape/ui.cpp
+++ b/engines/freescape/ui.cpp
@@ -43,7 +43,7 @@ void FreescapeEngine::titleScreen() {
 				break;
 			case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
 				switch (event.customType) {
-				case kActionChangeModeOrSkip:
+				case kActionSkip:
 					maxWait = -1;
 					break;
 				default:
@@ -205,7 +205,7 @@ void FreescapeEngine::drawBorderScreenAndWait(Graphics::Surface *surface, int ma
 				break;
 			case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
 				switch (event.customType) {
-				case kActionChangeModeOrSkip:
+				case kActionSkip:
 					maxWait = -1;
 					break;
 				default: