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.hpp | |
| 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.hpp')
| -rw-r--r-- | src/map/globals.hpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/map/globals.hpp b/src/map/globals.hpp index 5a4ec82..84e4765 100644 --- a/src/map/globals.hpp +++ b/src/map/globals.hpp @@ -49,17 +49,6 @@ namespace tmwa extern std::map<MapName, RString> resnametable; extern Map<ItemNameId, item_data> item_db; extern Map<QuestId, quest_data> quest_db; - namespace magic - { - // Global magic conf - extern magic_conf_t magic_conf; - extern env_t magic_default_env; - namespace magic_v2 - { - extern std::map<RString, proc_t> procs; - extern std::map<RString, val_t> const_defm; - } // namespace magic_v2 - } // namespace magic extern DMap<BlockId, dumb_ptr<block_list>> id_db; extern UPMap<MapName, map_abstract> maps_db; extern DMap<CharName, dumb_ptr<map_session_data>> nick_db; @@ -79,7 +68,8 @@ namespace tmwa extern BlockId npc_id; extern Map<NpcEvent, event_data> ev_db; extern DMap<NpcName, dumb_ptr<npc_data>> npcs_by_name; - extern DMap<RString, NpcEvent> spells_by_name; + extern DMap<RString, NpcName> spells_by_name; + extern DMap<RString, NpcEvent> spells_by_events; extern tm ev_tm_b; extern Map<PartyId, PartyMost> party_db; extern std::map<AccountId, GmLevel> gm_accountm; |