diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 11:36:12 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 11:36:12 -0400 |
| commit | e6e83bfc63dcf60cf036fff8e19e10fae40926db (patch) | |
| tree | 530c6270e94f998e84afad2cd31073ba6556cbb8 | |
| parent | 1ba24673e7064e39406e6faf11d790c2dcc2ac00 (diff) | |
| download | tmwa-e6e83bfc63dcf60cf036fff8e19e10fae40926db.tar.gz tmwa-e6e83bfc63dcf60cf036fff8e19e10fae40926db.tar.bz2 tmwa-e6e83bfc63dcf60cf036fff8e19e10fae40926db.tar.xz tmwa-e6e83bfc63dcf60cf036fff8e19e10fae40926db.zip | |
reset attack override on death
| -rw-r--r-- | src/map/pc.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
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) { |