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

[alxpnv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
284adf42be ASYLUM: add actions for mouse clicks
a5156cd63e ASYLUM: don't show inventory if an item is already selected


Commit: 284adf42be1ee1d85dc25d8aa80b780de522383f
    https://github.com/scummvm/scummvm/commit/284adf42be1ee1d85dc25d8aa80b780de522383f
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-06-29T10:56:23+03:00

Commit Message:
ASYLUM: add actions for mouse clicks

Changed paths:
    engines/asylum/metaengine.cpp


diff --git a/engines/asylum/metaengine.cpp b/engines/asylum/metaengine.cpp
index 0842891cf6c..7ccc34b8f42 100644
--- a/engines/asylum/metaengine.cpp
+++ b/engines/asylum/metaengine.cpp
@@ -23,6 +23,7 @@
 
 #include "backends/keymapper/action.h"
 #include "backends/keymapper/keymap.h"
+#include "backends/keymapper/standard-actions.h"
 
 #include "common/achievements.h"
 #include "common/savefile.h"
@@ -111,6 +112,18 @@ Common::KeymapArray AsylumMetaEngine::initKeymaps(const char *target) const {
 
 	Action *act;
 
+	act = new Action(kStandardActionLeftClick, _("Left Click"));
+	act->setLeftClickEvent();
+	act->addDefaultInputMapping("MOUSE_LEFT");
+	act->addDefaultInputMapping("JOY_A");
+	engineKeyMap->addAction(act);
+
+	act = new Action(kStandardActionRightClick, _("Right Click"));
+	act->setRightClickEvent();
+	act->addDefaultInputMapping("MOUSE_RIGHT");
+	act->addDefaultInputMapping("JOY_B");
+	engineKeyMap->addAction(act);
+
 	act = new Action("VERSION", _("Show version"));
 	act->setCustomEngineActionEvent(kAsylumActionShowVersion);
 	act->addDefaultInputMapping("v");
@@ -144,6 +157,7 @@ Common::KeymapArray AsylumMetaEngine::initKeymaps(const char *target) const {
 	act = new Action("INVENTORY", _("Open character inventory"));
 	act->setCustomEngineActionEvent(kAsylumActionOpenInventory);
 	act->addDefaultInputMapping("i");
+	act->addDefaultInputMapping("JOY_X");
 	engineKeyMap->addAction(act);
 
 	return Keymap::arrayOf(engineKeyMap);


Commit: a5156cd63eb0507ced8cf269d6b92c4efa5f1609
    https://github.com/scummvm/scummvm/commit/a5156cd63eb0507ced8cf269d6b92c4efa5f1609
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-06-29T11:02:20+03:00

Commit Message:
ASYLUM: don't show inventory if an item is already selected

Changed paths:
    engines/asylum/views/scene.cpp


diff --git a/engines/asylum/views/scene.cpp b/engines/asylum/views/scene.cpp
index 2487ec93030..c6157e9f8a1 100644
--- a/engines/asylum/views/scene.cpp
+++ b/engines/asylum/views/scene.cpp
@@ -448,7 +448,7 @@ bool Scene::action(AsylumAction a) {
 		break;
 
 	case kAsylumActionOpenInventory:
-		if (getActor()->inventory[0] && getActor()->getStatus() == kActorStatusEnabled) {
+		if (getActor()->inventory[0] && getActor()->getStatus() == kActorStatusEnabled && !getActor()->inventory.getSelectedItem()) {
 			getSound()->playSound(MAKE_RESOURCE(kResourcePackSound, 2));
 			getActor()->changeStatus(kActorStatusShowingInventory);
 		} else if (getActor()->getStatus() == kActorStatusShowingInventory || getActor()->getStatus() == kActorStatus10) {