1 files changed, 7 insertions, 15 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 4d70770..8a397a3 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -48,7 +48,9 @@
 #include "../mmo/extract_enums.hpp"
 
 #include "battle.hpp"
+#include "battle_conf.hpp"
 #include "clif.hpp"
+#include "globals.hpp"
 #include "magic-stmt.hpp"
 #include "mob.hpp"
 #include "pc.hpp"
@@ -58,7 +60,10 @@
 
 namespace tmwa
 {
-struct skill_name_db skill_names[] =
+namespace map
+{
+static
+skill_name_db skill_names[] =
 {
     {SkillID::AC_OWL, "OWL"_s, "Owl's_Eye"_s},
 
@@ -90,9 +95,6 @@ struct skill_name_db skill_names[] =
     {SkillID::ZERO, ""_s, ""_s}
 };
 
-earray<skill_db_, SkillID, SkillID::MAX_SKILL_DB> skill_db;
-
-
 static
 int skill_attack(BF attack_type, dumb_ptr<block_list> src,
         dumb_ptr<block_list> dsrc, dumb_ptr<block_list> bl,
@@ -378,17 +380,6 @@ void skill_area_sub(dumb_ptr<block_list> bl,
 }
 
 
-/* 範囲スキル使用処理小分けここまで
- * -------------------------------------------------------------------------
- */
-
-// these variables are set in the 'else' branches,
-// and used in the (recursive) 'if' branch
-// TODO kill it, kill it with fire.
-static BlockId skill_area_temp_id;
-static int skill_area_temp_hp;
-
-
 /*==========================================
  * スキル使用（詠唱完了、ID指定攻撃系）
  * （スパゲッティに向けて１歩前進！(ダメポ)）
@@ -1289,4 +1280,5 @@ skill_name_db& skill_lookup_by_name(XString name)
             return ner;
     return skill_names[num_names - 1];
 }
+} // namespace map
 } // namespace tmwa