Cancel targeted attack on dead targets

Fixes #962
diasurgical · Jul 19, 2021 · 6227c0a · 6227c0a
1 parent 4260d4c
commit 6227c0a
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Source/player.cpp b/Source/player.cpp
@@ -2965,13 +2965,21 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
 	case ACTION_RATTACKMON:
 	case ACTION_SPELLMON:
 		monster = &Monsters[targetId];
+		if ((monster->_mhitpoints >> 6) <= 0) {
+			player.Stop();
+			return;
+		}
 		if (player.destAction == ACTION_ATTACKMON)
 			MakePlrPath(pnum, monster->position.future, false);
 		break;
 	case ACTION_ATTACKPLR:
 	case ACTION_RATTACKPLR:
 	case ACTION_SPELLPLR:
 		target = &Players[targetId];
+		if ((target->_pHitPoints >> 6) <= 0) {
+			player.Stop();
+			return;
+		}
 		if (player.destAction == ACTION_ATTACKPLR)
 			MakePlrPath(pnum, target->position.future, false);
 		break;