From e6e83bfc63dcf60cf036fff8e19e10fae40926db Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Tue, 19 Apr 2016 11:36:12 -0400
Subject: reset attack override on death

---
 src/map/pc.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/map')

diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index bf75852..d2cc12c 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -3263,10 +3263,15 @@ int pc_damage(dumb_ptr<block_list> src, dumb_ptr<map_session_data> sd,
     pc_setglobalreg(sd, stringish<VarName>("PC_DIE_COUNTER"_s), ++sd->die_counter);  //死にカウンター書き込み
     skill_status_change_clear(sd, 0); // ステータス異常を解除する
     clif_updatestatus(sd, SP::HP);
-    pc_calcstatus(sd, 0);
     // [Fate] Reset magic
-    //sd->cast_tick = gettick();
-    //magic_stop_completely(sd);
+    // FIXME: make spells manage their own charge counter, and reset on death
+    if (sd->attack_spell_override)
+    {
+        sd->attack_spell_override = BlockId();
+        pc_set_weapon_icon(sd, 0, StatusChange::ZERO, ItemNameId());
+        pc_set_attack_info(sd, interval_t::zero(), 0);
+    }
+    pc_calcstatus(sd, 0);
 
     if (battle_config.death_penalty_type > 0 && sd->status.base_level >= 20)
     {
-- 
cgit v1.2.3-70-g09d2