From b3112bd3f6d0887fdf81610327c9edad08a0cfaf Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 10 Jan 2015 17:32:49 -0800
Subject: Use generated config for map

---
 src/map/magic-interpreter-base.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/map/magic-interpreter-base.hpp')

diff --git a/src/map/magic-interpreter-base.hpp b/src/map/magic-interpreter-base.hpp
index 2557ecb..7c00db0 100644
--- a/src/map/magic-interpreter-base.hpp
+++ b/src/map/magic-interpreter-base.hpp
@@ -24,11 +24,10 @@
 
 namespace tmwa
 {
+namespace map
+{
 namespace magic
 {
-extern magic_conf_t magic_conf; /* Global magic conf */
-extern env_t magic_default_env; /* Fake default environment */
-
 /**
  * Adds a component selection to a component holder (which may initially be nullptr)
  */
@@ -81,4 +80,5 @@ dumb_ptr<spell_t> magic_find_spell(XString invocation);
 
 void spell_update_location(dumb_ptr<invocation> invocation);
 } // namespace magic
+} // namespace map
 } // namespace tmwa
-- 
cgit v1.2.3-70-g09d2