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/pc.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/pc.cpp')
| -rw-r--r-- | src/map/pc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 0cb8382..2fa8bb7 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -2782,7 +2782,7 @@ void pc_attack_timer(TimerData *, tick_t tick, BlockId id) interval_t attack_spell_delay = sd->attack_spell_delay; if (sd->attack_spell_override // [Fate] If we have an active attack spell, use that - && spell_attack(id, sd->attacktarget)) + && magic::spell_attack(id, sd->attacktarget)) { // Return if the spell succeeded. If the spell had disspiated, spell_attack() may fail. sd->attackabletime = tick + attack_spell_delay; @@ -3464,7 +3464,7 @@ int pc_damage(dumb_ptr<block_list> src, dumb_ptr<map_session_data> sd, pc_calcstatus(sd, 0); // [Fate] Reset magic sd->cast_tick = gettick(); - magic_stop_completely(sd); + magic::magic_stop_completely(sd); if (battle_config.death_penalty_type > 0 && sd->status.base_level >= 20) { @@ -5234,7 +5234,7 @@ void do_init_pc(void) void pc_cleanup(dumb_ptr<map_session_data> sd) { - magic_stop_completely(sd); + magic::magic_stop_completely(sd); } void pc_invisibility(dumb_ptr<map_session_data> sd, int enabled) |