[Scummvm-git-logs] scummvm master -> 2b5f0c7177f9c115a4877aa9caf4dd4bce840bfb

[antoniou79]

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:
2b5f0c7177 BLADERUNNER: Fix regression for toggling clue privacy


Commit: 2b5f0c7177f9c115a4877aa9caf4dd4bce840bfb
    https://github.com/scummvm/scummvm/commit/2b5f0c7177f9c115a4877aa9caf4dd4bce840bfb
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-07-15T11:08:40+03:00

Commit Message:
BLADERUNNER: Fix regression for toggling clue privacy

This KIA hotkey was not considered when switching to the ScummVM keymapper

Changed paths:
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/bladerunner.h
    engines/bladerunner/metaengine.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index ced802611e7..0947b8cca27 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #include "bladerunner/bladerunner.h"
 
 #include "bladerunner/actor.h"
@@ -1468,6 +1467,8 @@ void BladeRunnerEngine::handleEvents() {
 			}
 			switch ((BladeRunnerEngineMappableAction)event.customType) {
 			case kMpActionToggleCombat:
+				// fall through
+			case kMpActionToggleCluePrivacy:
 				handleMouseAction(event.mouse.x, event.mouse.y, false, false);
 				break;
 
@@ -1513,6 +1514,8 @@ void BladeRunnerEngine::handleEvents() {
 			if (!event.kbdRepeat) {
 				switch ((BladeRunnerEngineMappableAction)event.customType) {
 				case kMpActionToggleCombat:
+					// fall through
+				case kMpActionToggleCluePrivacy:
 					handleMouseAction(event.mouse.x, event.mouse.y, false, true);
 					break;
 
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index cd2efb101a0..541b9efc22c 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -332,7 +332,8 @@ public:
 		kMpActionScrollUp,                     // ScummVM addition (scroll list up)
 		kMpActionScrollDown,                   // ScummVM addition (scroll list down)
 		kMpConfirmDlg,                         // default <Return> or <KP_Enter>
-		kMpDeleteSelectedSvdGame               // default <Delete> or <KP_Period>
+		kMpDeleteSelectedSvdGame,              // default <Delete> or <KP_Period>
+		kMpActionToggleCluePrivacy             // default <right click>
 	};
 
 private:
diff --git a/engines/bladerunner/metaengine.cpp b/engines/bladerunner/metaengine.cpp
index f04002d1363..cd00e38fafb 100644
--- a/engines/bladerunner/metaengine.cpp
+++ b/engines/bladerunner/metaengine.cpp
@@ -216,6 +216,14 @@ Common::KeymapArray BladeRunnerMetaEngine::initKeymaps(const char *target) const
 	act->addDefaultInputMapping("JOY_DOWN");
 	kiaOnlyKeymap->addAction(act);
 
+	// I18N: This keymap allows (in KIA only) for a clue to be set as private or public
+	// (only when the KIA is upgraded).
+	act = new Action("KIATOGGLECLUEPRIVACY", _("Toggle Clue Privacy"));
+	act->setCustomEngineActionEvent(BladeRunnerEngine::kMpActionToggleCluePrivacy);
+	act->addDefaultInputMapping("MOUSE_RIGHT");
+	act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
+	kiaOnlyKeymap->addAction(act);
+
 	// I18N: This keymap opens KIA's HELP tab.
 	// In Blade Runner's official localizations, there is a description of this keymap
 	// on the KIA Help Page, under Keyboard Shortcuts. In the English version it is