From 9d7fd8b37f97265f37cc12026e535e953942a1ab Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 23 Jul 2014 18:37:53 -0700
Subject: Move magic to its own namespace

---
 src/map/clif.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/map/clif.cpp')

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);
 
-- 
cgit v1.2.3-60-g2f50