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/clif.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/clif.cpp')
| -rw-r--r-- | src/map/clif.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index bb21ca9..fb4041c 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -3732,7 +3732,7 @@ RecvResult clif_parse_GlobalMessage(Session *s, dumb_ptr<map_session_data> sd) if (is_atcommand(s, sd, mbuf, GmLevel())) return rv; - if (!magic_message(sd, mbuf)) + if (!magic::magic_message(sd, mbuf)) { /* Don't send chat that results in an automatic ban. */ if (tmw_CheckChatSpam(sd, mbuf)) @@ -4096,7 +4096,7 @@ RecvResult clif_parse_TakeItem(Session *s, dumb_ptr<map_session_data> sd) return rv; // too far away to pick up if (sd->state.shroud_active && sd->state.shroud_disappears_on_pickup) - magic_unshroud(sd); + magic::magic_unshroud(sd); pc_takeitem(sd, fitem); |