From 506a41d6926405b2753894f0b40130b4077828b3 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Tue, 9 Jun 2015 01:06:22 -0500
Subject: Remove old Magic

---
 src/map/map.cpp | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/map/map.cpp')

diff --git a/src/map/map.cpp b/src/map/map.cpp
index d40977f..362d5d2 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"
@@ -1454,9 +1451,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 +1491,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 +1507,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 +1554,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)
-- 
cgit v1.2.3-70-g09d2