diff options
Diffstat (limited to 'src/map/map.cpp')
| -rw-r--r-- | src/map/map.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index d40977f..e7b0da8 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -69,9 +69,6 @@ #include "globals.hpp" #include "grfio.hpp" #include "itemdb.hpp" -#include "magic-interpreter.hpp" // for is_spell inline body -#include "magic-stmt.hpp" -#include "magic-v2.hpp" #include "map_conf.hpp" #include "mob.hpp" #include "quest.hpp" @@ -576,8 +573,6 @@ void map_delobject(BlockId id, BL type) return; map_delobjectnofree(id, type); - if (obj->bl_type == BL::PC) // [Fate] Not sure where else to put this... I'm not sure where delobject for PCs is called from - pc_cleanup(obj->is_player()); MapBlockLock::freeblock(obj); } @@ -1454,9 +1449,6 @@ void cleanup_sub(dumb_ptr<block_list> bl) case BL::ITEM: map_clearflooritem(bl->bl_id); break; - case BL::SPELL: - magic::spell_free_invocation(bl->is_spell()); - break; } } @@ -1497,8 +1489,6 @@ bool map_confs(io::Spanned<XString> key, io::Spanned<ZString> value) return mob_readskilldb(value.data); if (key.data == "skill_db"_s) return skill_readdb(value.data); - if (key.data == "magic_conf"_s) - return magic::load_magic_file_v2(value.data); if (key.data == "resnametable"_s) return load_resnametable(value.data); @@ -1515,16 +1505,7 @@ int map_scriptcont(dumb_ptr<map_session_data> sd, BlockId id) if (!bl) return 0; - switch (bl->bl_type) - { - case BL::NPC: - return npc_scriptcont(sd, id); - case BL::SPELL: - magic::spell_execute_script(bl->is_spell()); - break; - } - - return 0; + return npc_scriptcont(sd, id); } } // namespace map @@ -1571,7 +1552,6 @@ int do_init(Slice<ZString> argv) using namespace tmwa::map; ZString argv0 = argv.pop_front(); - runflag &= magic::magic_init0(); bool loaded_config_yet = false; while (argv) |