Merge FixAutomapHardcodedRS branch

Author: wkdgmr

Source.zip

@@ -166,7 +166,7 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 			    || (!VirtualGamepadState.secondaryActionButton.isHeld && ControllerActionHeld == GameActionType_SECONDARY_ACTION)
 			    || (!VirtualGamepadState.spellActionButton.isHeld && ControllerActionHeld == GameActionType_CAST_SPELL)) {
 				ControllerActionHeld = GameActionType_NONE;
-				LastMouseButtonAction = MouseActionType::None;
+				LastPlayerAction = PlayerActionType::None;
 			}
 		}
 	}
@@ -265,7 +265,7 @@ void PressControllerButton(ControllerButton button)
 		switch (button) {
 		case devilution::ControllerButton_BUTTON_DPAD_UP:
 			PressEscKey();
-			LastMouseButtonAction = MouseActionType::None;
+			LastPlayerAction = PlayerActionType::None;
 			PadHotspellMenuActive = false;
 			PadMenuNavigatorActive = false;
 			gamemenu_on();

Source/controls/game_controls.cpp

@@ -21,6 +21,7 @@ enum GameActionType : uint8_t {
 	GameActionType_TOGGLE_SPELL_BOOK,
 	GameActionType_TOGGLE_QUEST_LOG,
 	GameActionType_SEND_KEY,
+	GameActionType_MOVE_AUTOMAP,
 };
 
 struct GameActionSendKey {

Source/controls/game_controls.h

@@ -515,7 +515,7 @@ void Interact()
 		}
 
 		NetSendCmdLoc(MyPlayerId, true, myPlayer.UsesRangedWeapon() ? CMD_RATTACKXY : CMD_SATTACKXY, position);
-		LastMouseButtonAction = MouseActionType::Attack;
+		LastPlayerAction = PlayerActionType::Attack;
 		return;
 	}
 
@@ -525,19 +525,19 @@ void Interact()
 		} else {
 			NetSendCmdParam1(true, CMD_RATTACKID, pcursmonst);
 		}
-		LastMouseButtonAction = MouseActionType::AttackMonsterTarget;
+		LastPlayerAction = PlayerActionType::AttackMonsterTarget;
 		return;
 	}
 
 	if (leveltype != DTYPE_TOWN && PlayerUnderCursor != nullptr && !myPlayer.friendlyMode) {
 		NetSendCmdParam1(true, myPlayer.UsesRangedWeapon() ? CMD_RATTACKPID : CMD_ATTACKPID, PlayerUnderCursor->getId());
-		LastMouseButtonAction = MouseActionType::AttackPlayerTarget;
+		LastPlayerAction = PlayerActionType::AttackPlayerTarget;
 		return;
 	}
 
 	if (ObjectUnderCursor != nullptr) {
 		NetSendCmdLoc(MyPlayerId, true, CMD_OPOBJXY, cursPosition);
-		LastMouseButtonAction = MouseActionType::OperateObject;
+		LastPlayerAction = PlayerActionType::OperateObject;
 		return;
 	}
 }
@@ -1826,15 +1826,6 @@ void HandleRightStickMotion()
 		return;
 	}
 
-	if (AutomapActive) { // move map
-		int dx = 0;
-		int dy = 0;
-		acc.Pool(&dx, &dy, 32);
-		AutomapOffset.deltaX += dy + dx;
-		AutomapOffset.deltaY += dy - dx;
-		return;
-	}
-
 	{ // move cursor
 		InvalidateInventorySlot();
 		int x = MousePosition.x;
@@ -1899,7 +1890,7 @@ void plrctrls_after_check_curs_move()
 	}
 
 	// While holding the button down we should retain target (but potentially lose it if it dies, goes out of view, etc)
-	if (ControllerActionHeld != GameActionType_NONE && IsNoneOf(LastMouseButtonAction, MouseActionType::None, MouseActionType::Attack, MouseActionType::Spell)) {
+	if (ControllerActionHeld != GameActionType_NONE && IsNoneOf(LastPlayerAction, PlayerActionType::None, PlayerActionType::Attack, PlayerActionType::Spell)) {
 		InvalidateTargets();
 
 		if (pcursmonst == -1 && ObjectUnderCursor == nullptr && pcursitem == -1 && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && PlayerUnderCursor == nullptr) {
@@ -2100,11 +2091,11 @@ void PerformSpellAction()
 	UpdateSpellTarget(myPlayer._pRSpell);
 	CheckPlrSpell(false);
 	if (PlayerUnderCursor != nullptr)
-		LastMouseButtonAction = MouseActionType::SpellPlayerTarget;
+		LastPlayerAction = PlayerActionType::SpellPlayerTarget;
 	else if (pcursmonst != -1)
-		LastMouseButtonAction = MouseActionType::SpellMonsterTarget;
+		LastPlayerAction = PlayerActionType::SpellMonsterTarget;
 	else
-		LastMouseButtonAction = MouseActionType::Spell;
+		LastPlayerAction = PlayerActionType::Spell;
 }
 
 void CtrlUseInvItem()
@@ -2187,7 +2178,7 @@ void PerformSecondaryAction()
 		NetSendCmdLocParam1(true, CMD_GOTOAGETITEM, cursPosition, pcursitem);
 	} else if (ObjectUnderCursor != nullptr) {
 		NetSendCmdLoc(MyPlayerId, true, CMD_OPOBJXY, cursPosition);
-		LastMouseButtonAction = MouseActionType::OperateObject;
+		LastPlayerAction = PlayerActionType::OperateObject;
 	} else {
 		if (pcursmissile != nullptr) {
 			MakePlrPath(myPlayer, pcursmissile->position.tile, true);
@@ -2204,7 +2195,7 @@ void PerformSecondaryAction()
 
 void QuickCast(size_t slot)
 {
-	MouseActionType prevMouseButtonAction = LastMouseButtonAction;
+	PlayerActionType prevMouseButtonAction = LastPlayerAction;
 	Player &myPlayer = *MyPlayer;
 	SpellID spell = myPlayer._pSplHotKey[slot];
 	SpellType spellType = myPlayer._pSplTHotKey[slot];
@@ -2214,7 +2205,7 @@ void QuickCast(size_t slot)
 	}
 
 	CheckPlrSpell(false, spell, spellType);
-	LastMouseButtonAction = prevMouseButtonAction;
+	LastPlayerAction = prevMouseButtonAction;
 }
 
 } // namespace devilution

Source/controls/plrctrls.cpp

@@ -762,7 +762,7 @@ void ShiftToDiamondGridAlignment(Point screenPosition, Point &tile, bool &flipfl
  */
 bool CheckMouseHold(const Point currentTile)
 {
-	if ((sgbMouseDown != CLICK_NONE || ControllerActionHeld != GameActionType_NONE) && IsNoneOf(LastMouseButtonAction, MouseActionType::None, MouseActionType::Attack, MouseActionType::Spell)) {
+	if ((sgbMouseDown != CLICK_NONE || ControllerActionHeld != GameActionType_NONE) && IsNoneOf(LastPlayerAction, PlayerActionType::None, PlayerActionType::Attack, PlayerActionType::Spell)) {
 		InvalidateTargets();
 
 		if (pcursmonst == -1 && ObjectUnderCursor == nullptr && pcursitem == -1 && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && PlayerUnderCursor == nullptr) {