diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
| commit | 1ba24673e7064e39406e6faf11d790c2dcc2ac00 (patch) | |
| tree | 7e2645f6fdec1dcc63ae56366371246f62865dcd /src/map/globals.hpp | |
| parent | c3e06ffe6437d27a2a7c6ddb2dc487ff2f007adf (diff) | |
| parent | c786a93e91adaf68780a5fd7585f51d0528f92ed (diff) | |
| download | tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.gz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.bz2 tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.xz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3
Diffstat (limited to 'src/map/globals.hpp')
| -rw-r--r-- | src/map/globals.hpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/map/globals.hpp b/src/map/globals.hpp index b457b4e..1c8e70d 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,6 +68,7 @@ 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_events; extern tm ev_tm_b; extern Map<PartyId, PartyMost> party_db; extern std::map<AccountId, GmLevel> gm_accountm; |