From 11f8c952e50de6186e0c4cc69257cc17bdee883a Mon Sep 17 00:00:00 2001
From: obligaron <obligaron@live.com>
Date: Thu, 20 May 2021 08:42:37 +0200
Subject: [PATCH] CheckNewPath: Use correct player for repeated attack check

---
 Source/player.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/player.cpp b/Source/player.cpp
index 68d419b8e..fb0d00b3b 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -3412,9 +3412,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
 		return;
 	}
 
-	auto &myPlayer = plr[myplr];
-
-	if (player._pmode == PM_ATTACK && player.AnimInfo.CurrentFrame > myPlayer._pAFNum) {
+	if (player._pmode == PM_ATTACK && player.AnimInfo.CurrentFrame > player._pAFNum) {
 		if (player.destAction == ACTION_ATTACK) {
 			d = GetDirection(player.position.future, { player.destParam1, player.destParam2 });
 			StartAttack(pnum, d);
@@ -3453,7 +3451,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
 		}
 	}
 
-	if (player._pmode == PM_RATTACK && player.AnimInfo.CurrentFrame > myPlayer._pAFNum) {
+	if (player._pmode == PM_RATTACK && player.AnimInfo.CurrentFrame > player._pAFNum) {
 		if (player.destAction == ACTION_RATTACK) {
 			d = GetDirection(player.position.tile, { player.destParam1, player.destParam2 });
 			StartRangeAttack(pnum, d, player.destParam1, player.destParam2);