diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-10 17:32:49 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-23 01:57:20 -0800 |
| commit | b3112bd3f6d0887fdf81610327c9edad08a0cfaf (patch) | |
| tree | e1b1099468399a3b22852a5947a3cac47da904ca /src/map/magic-v2.cpp | |
| parent | c482e420bcf447073ffe3ff8a106a0561e0baadd (diff) | |
| download | tmwa-b3112bd3f6d0887fdf81610327c9edad08a0cfaf.tar.gz tmwa-b3112bd3f6d0887fdf81610327c9edad08a0cfaf.tar.bz2 tmwa-b3112bd3f6d0887fdf81610327c9edad08a0cfaf.tar.xz tmwa-b3112bd3f6d0887fdf81610327c9edad08a0cfaf.zip | |
Use generated config for map
Diffstat (limited to 'src/map/magic-v2.cpp')
| -rw-r--r-- | src/map/magic-v2.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/magic-v2.cpp b/src/map/magic-v2.cpp index 7dfae08..52b1b8f 100644 --- a/src/map/magic-v2.cpp +++ b/src/map/magic-v2.cpp @@ -38,6 +38,7 @@ #include "../ast/script.hpp" +#include "globals.hpp" #include "itemdb.hpp" #include "magic-expr.hpp" #include "magic-interpreter.hpp" @@ -50,16 +51,13 @@ namespace tmwa { +namespace map +{ namespace magic { namespace magic_v2 { static - std::map<RString, proc_t> procs; - static - std::map<RString, val_t> const_defm; - - static size_t intern_id(ZString id_name) { // TODO use InternPool @@ -1293,4 +1291,5 @@ bool load_magic_file_v2(ZString filename) return rv; } } // namespace magic +} // namespace map } // namespace tmwa |