From ffae6d805bd65975b13e946302e3ecfe97ad892a Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 11 Dec 2021 04:31:10 +0100
Subject: [PATCH] Clean up check for borken monster position in DirOK

---
 Source/monster.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Source/monster.cpp b/Source/monster.cpp
index 2bb37e694..7eacf09a4 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -4410,13 +4410,11 @@ bool DirOK(int i, Direction mdir)
 			if (!InDungeonBounds({ x, y }))
 				continue;
 			int mi = dMonster[x][y];
-			if (mi == 0)
+			if (mi <= 0)
 				continue;
 
-			auto &minion = Monsters[(mi < 0) ? -(mi + 1) : (mi - 1)];
-			if (minion.leaderRelation == LeaderRelation::Leashed
-			    && minion.leader == i
-			    && minion.position.future == Point { x, y }) {
+			auto &minion = Monsters[mi - 1];
+			if (minion.leaderRelation == LeaderRelation::Leashed && minion.leader == i) {
 				mcount++;
 			}
 		}