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.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index e0392e4..c2be363 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -30,6 +30,7 @@
 
 #include "../net/timer.hpp"
 
+#include "globals.hpp"
 #include "magic.hpp"
 #include "magic-expr.hpp"
 #include "magic-interpreter.hpp"
@@ -40,6 +41,8 @@
 
 namespace tmwa
 {
+namespace map
+{
 namespace magic
 {
 static
@@ -79,9 +82,6 @@ void set_spell(val_t *v, dumb_ptr<spell_t> x)
     *v = ValSpell{x};
 }
 
-magic_conf_t magic_conf;        /* Global magic conf */
-env_t magic_default_env = { &magic_conf, nullptr };
-
 AString magic_find_invocation(XString spellname)
 {
     auto it = magic_conf.spells_by_name.find(spellname);
@@ -549,4 +549,5 @@ int spell_unbind(dumb_ptr<map_session_data> subject, dumb_ptr<invocation> invoca
     return 1;
 }
 } // namespace magic
+} // namespace map
 } // namespace tmwa
-- 
cgit v1.2.3-60-g2f50