From 2759eb130b490ff9fffe0d2376c5f59dcdb3f02f Mon Sep 17 00:00:00 2001
From: staphen <staphen@gmail.com>
Date: Sun, 10 Apr 2022 10:50:48 -0400
Subject: [PATCH] Update player's spell target when using quick cast on gamepad

---
 Source/controls/plrctrls.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index 0ef88e273..17779ff29 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -2017,8 +2017,14 @@ void PerformSecondaryAction()
 void QuickCast(int slot)
 {
 	auto &myPlayer = Players[MyPlayerId];
+	spell_id spell = myPlayer._pSplHotKey[slot];
+	spell_type spellType = myPlayer._pSplTHotKey[slot];
 
-	CheckPlrSpell(false, myPlayer._pSplHotKey[slot], myPlayer._pSplTHotKey[slot]);
+	if (ControlMode != ControlTypes::KeyboardAndMouse) {
+		UpdateSpellTarget(spell);
+	}
+
+	CheckPlrSpell(false, spell, spellType);
 }
 
 } // namespace devilution