From fe3d4ce758822d65a0a5d617b7b77df2dbc972d8 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sun, 16 Mar 2014 14:55:57 -0700
Subject: Implement new magic frontend using sexpr

---
 src/map/map.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/src/map/map.cpp b/src/map/map.cpp
index d9dd9cc..e5a3341 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -41,6 +41,7 @@
 #include "itemdb.hpp"
 #include "magic.hpp"
 #include "magic-interpreter.hpp"
+#include "magic-v2.hpp"
 #include "mob.hpp"
 #include "npc.hpp"
 #include "party.hpp"
@@ -1654,7 +1655,7 @@ bool map_confs(XString key, ZString value)
     if (key == "skill_db")
         return skill_readdb(value);
     if (key == "magic_conf")
-        return magic_init1(value);
+        return load_magic_file_v2(value);
 
     if (key == "resnametable")
         return load_resnametable(value);
-- 
cgit v1.2.3-60-g2f50