diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-16 14:55:57 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-24 19:27:09 -0700 |
| commit | fe3d4ce758822d65a0a5d617b7b77df2dbc972d8 (patch) | |
| tree | d048a7e356ba542ebc5647b1aedfce4b8257daa2 /src/map/map.cpp | |
| parent | c812c92d1a1835f0bda783e709481188c8d92225 (diff) | |
| download | tmwa-fe3d4ce758822d65a0a5d617b7b77df2dbc972d8.tar.gz tmwa-fe3d4ce758822d65a0a5d617b7b77df2dbc972d8.tar.bz2 tmwa-fe3d4ce758822d65a0a5d617b7b77df2dbc972d8.tar.xz tmwa-fe3d4ce758822d65a0a5d617b7b77df2dbc972d8.zip | |
Implement new magic frontend using sexpr
Diffstat (limited to 'src/map/map.cpp')
| -rw-r--r-- | src/map/map.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |