diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-07-23 18:37:53 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 15:59:36 -0700 |
| commit | 9d7fd8b37f97265f37cc12026e535e953942a1ab (patch) | |
| tree | 709218889e6977f9aeb1b47e9ce42d0e48b88007 /src/map/skill.cpp | |
| parent | 44ba9a9eebec2ffe202fc5594f76864a56f3730a (diff) | |
| download | tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.gz tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.bz2 tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.tar.xz tmwa-9d7fd8b37f97265f37cc12026e535e953942a1ab.zip | |
Move magic to its own namespace
Diffstat (limited to 'src/map/skill.cpp')
| -rw-r--r-- | src/map/skill.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 20dcb1a..add6a42 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -851,7 +851,7 @@ void skill_status_change_timer(TimerData *tid, tick_t tick, BlockId id, StatusCh if (sc_data[type].spell_invocation) { // Must report termination - spell_effect_report_termination(sc_data[type].spell_invocation, + magic::spell_effect_report_termination(sc_data[type].spell_invocation, bl->bl_id, type, 0); sc_data[type].spell_invocation = BlockId(); } @@ -1084,7 +1084,7 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type, sc_data[type].val1 = val1; if (sc_data[type].spell_invocation) // Supplant by newer spell - spell_effect_report_termination(sc_data[type].spell_invocation, + magic::spell_effect_report_termination(sc_data[type].spell_invocation, bl->bl_id, type, 1); sc_data[type].spell_invocation = spell_invocation; |