From 70be1d2932be67e19dff5afd680c8405b3325b57 Mon Sep 17 00:00:00 2001 From: Jyrki Vesterinen Date: Mon, 28 May 2018 22:11:55 +0300 Subject: [PATCH] Revert "Allow modifying dead units in more event handlers" This reverts commit 9110e49760e40d9856b96f884f3c1636e034768c. --- src/actions/attack.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/actions/attack.cpp b/src/actions/attack.cpp index a693de6cc05b..187bcbbbde1d 100644 --- a/src/actions/attack.cpp +++ b/src/actions/attack.cpp @@ -1195,16 +1195,10 @@ 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; } @@ -1212,7 +1206,6 @@ bool attack::perform_hit(bool attacker_turn, statistics::attack_context& stats) 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; }