[Scummvm-git-logs] scummvm branch-2-6 -> 3962bb3eaa29e96d2c15778c9245e5fe60cd5639

[alxpnv]

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

Summary:
3ef995fec2 ASYLUM: make byte twiddling macros endian agnostic
feecbd12c5 ASYLUM: add actions for mouse clicks
3962bb3eaa ASYLUM: don't show inventory if an item is already selected


Commit: 3ef995fec24364eff2298c480778de09bf9bb033
    https://github.com/scummvm/scummvm/commit/3ef995fec24364eff2298c480778de09bf9bb033
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-06-29T11:53:12+03:00

Commit Message:
ASYLUM: make byte twiddling macros endian agnostic

Also removed a couple of unused macros

Changed paths:
    engines/asylum/shared.h


diff --git a/engines/asylum/shared.h b/engines/asylum/shared.h
index 474b984bb61..bdb937a3a91 100644
--- a/engines/asylum/shared.h
+++ b/engines/asylum/shared.h
@@ -922,10 +922,13 @@ enum AsylumAction {
 //////////////////////////////////////////////////////////////////////////
 // Sub-integer partial access macros
 //////////////////////////////////////////////////////////////////////////
+#if   defined SCUMM_LITTLE_ENDIAN
 #define LOBYTE(d)   (*((char *)&(d)))
 #define BYTE1(d)    (*((char *)&(d) + 1))   // Same as HIBYTE()
-#define BYTE2(d)    (*((char *)&(d) + 2))
-#define LOWORD(x)   (*((int16 *)&(x)))
+#elif defined SCUMM_BIG_ENDIAN
+#define LOBYTE(d)   (*((char *)&(d) + sizeof(d) - 1))
+#define BYTE1(d)    (*((char *)&(d) + sizeof(d) - 2))
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 // Resource ID macros


Commit: feecbd12c5510571c899fade99dde5b7a84dc2ab
    https://github.com/scummvm/scummvm/commit/feecbd12c5510571c899fade99dde5b7a84dc2ab
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-06-29T11:53:13+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: 3962bb3eaa29e96d2c15778c9245e5fe60cd5639
    https://github.com/scummvm/scummvm/commit/3962bb3eaa29e96d2c15778c9245e5fe60cd5639
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-06-29T11:53:13+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) {