diff options
| author | wushin <pasekei@gmail.com> | 2015-06-09 01:06:22 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:44:49 -0400 |
| commit | 506a41d6926405b2753894f0b40130b4077828b3 (patch) | |
| tree | 401fd473a23d80dcdcbd56d0c89f6587a46f878c /src/map/skill.cpp | |
| parent | a8640e1df61c06faf6edb89c5c4b9f025c0dff33 (diff) | |
| download | tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.gz tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.bz2 tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.xz tmwa-506a41d6926405b2753894f0b40130b4077828b3.zip | |
Remove old Magic
Diffstat (limited to 'src/map/skill.cpp')
| -rw-r--r-- | src/map/skill.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 8a397a3..6066a0d 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -51,7 +51,6 @@ #include "battle_conf.hpp" #include "clif.hpp" #include "globals.hpp" -#include "magic-stmt.hpp" #include "mob.hpp" #include "pc.hpp" @@ -822,13 +821,6 @@ void skill_status_change_timer(TimerData *tid, tick_t tick, BlockId id, StatusCh if (bl->bl_type == BL::PC) sd = bl->is_player(); - if (sc_data[type].spell_invocation) - { // Must report termination - magic::spell_effect_report_termination(sc_data[type].spell_invocation, - bl->bl_id, type, 0); - sc_data[type].spell_invocation = BlockId(); - } - switch (type) { case StatusChange::SC_POISON: @@ -1050,11 +1042,6 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type, clif_changeoption(bl); sc_data[type].val1 = val1; - if (sc_data[type].spell_invocation) // Supplant by newer spell - magic::spell_effect_report_termination(sc_data[type].spell_invocation, - bl->bl_id, type, 1); - - sc_data[type].spell_invocation = spell_invocation; /* タイマー設定 */ sc_data[type].timer = Timer(gettick() + tick, |