diff options
author | wushin <pasekei@gmail.com> | 2015-06-09 01:06:22 -0500 |
---|---|---|
committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:44:49 -0400 |
commit | 506a41d6926405b2753894f0b40130b4077828b3 (patch) | |
tree | 401fd473a23d80dcdcbd56d0c89f6587a46f878c /src/map/globals.cpp | |
parent | a8640e1df61c06faf6edb89c5c4b9f025c0dff33 (diff) | |
download | tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.gz tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.bz2 tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.xz tmwa-506a41d6926405b2753894f0b40130b4077828b3.zip |
Remove old Magic
Diffstat (limited to 'src/map/globals.cpp')
-rw-r--r-- | src/map/globals.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/map/globals.cpp b/src/map/globals.cpp index 4a54843..c96037e 100644 --- a/src/map/globals.cpp +++ b/src/map/globals.cpp @@ -27,7 +27,6 @@ #include "battle_conf.hpp" #include "itemdb.hpp" #include "quest.hpp" -#include "magic-interpreter.hpp" #include "map_conf.hpp" #include "mob.hpp" #include "npc-internal.hpp" @@ -51,17 +50,6 @@ namespace tmwa std::map<MapName, RString> resnametable; Map<ItemNameId, item_data> item_db; Map<QuestId, quest_data> quest_db; - namespace magic - { - // Global magic conf - magic_conf_t magic_conf; - env_t magic_default_env = { &magic_conf, nullptr }; - namespace magic_v2 - { - std::map<RString, proc_t> procs; - std::map<RString, val_t> const_defm; - } // namespace magic_v2 - } // namespace magic DMap<BlockId, dumb_ptr<block_list>> id_db; UPMap<MapName, map_abstract> maps_db; @@ -85,7 +73,8 @@ namespace tmwa BlockId npc_id = START_NPC_NUM; Map<NpcEvent, struct event_data> ev_db; DMap<NpcName, dumb_ptr<npc_data>> npcs_by_name; - DMap<RString, NpcEvent> spells_by_name; + DMap<RString, NpcName> spells_by_name; + DMap<RString, NpcEvent> spells_by_events; // used for clock-based event triggers // only tm_min, tm_hour, and tm_mday are used tm ev_tm_b = @@ -142,9 +131,5 @@ namespace tmwa // BuiltinFunction builtin_functions[]; // src/map/clif.cpp: // func_table clif_parse_func_table[0x0220]; - // src/map/magic-expr.cpp: - // std::map<ZString, fun_t> functions; - // src/map/magic-stmt.cpp: - // std::map<ZString, op_t> operations; } // namespace map } // namespace tmwa |