Allow modifying dead units in more event handlers

Namely attacker_hits, attacker_misses, defender_hits and defender_misses.
wesnoth · May 16, 2018 · 9110e49 · 9110e49
1 parent e0beff6
commit 9110e49
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/actions/attack.cpp b/src/actions/attack.cpp
@@ -1199,17 +1199,24 @@ bool attack::perform_hit(bool attacker_turn, statistics::attack_context& stats)
 		OOS_error_ = true;
 	}
 
+	if(dies) {
+		// Will be reset in unit_killed() later.
+		unit::dying_unit_loc = defender.loc_;
+	}
+
 	if(hits) {
 		try {
 			fire_event(attacker_turn ? "attacker_hits" : "defender_hits");
 		} catch(const attack_end_exception&) {
+			unit::dying_unit_loc = map_location::null_location();
 			refresh_bc();
 			return false;
 		}
 	} else {
 		try {
 			fire_event(attacker_turn ? "attacker_misses" : "defender_misses");
 		} catch(const attack_end_exception&) {
+			unit::dying_unit_loc = map_location::null_location();
 			refresh_bc();
 			return false;
 		}