Clean up check for borken monster position in DirOK

4 years ago · ffae6d805b
1 changed files with 3 additions and 5 deletions
--- 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++;
 			}
 		}