1 files changed, 16 insertions, 17 deletions
diff --git a/src/map/battle.hpp b/src/map/battle.hpp
index b8060a9..97a4a86 100644
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_MAP_BATTLE_HPP
-#define TMWA_MAP_BATTLE_HPP
+#pragma once
 //    battle.hpp - Not so scary code.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,18 +20,23 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+#include "fwd.hpp"
 
-# include "battle.t.hpp"
+#include "battle.t.hpp"
 
-# include "../strings/fwd.hpp"
+#include "../strings/fwd.hpp"
 
-# include "../mmo/timer.t.hpp"
+#include "../generic/fwd.hpp"
 
-# include "magic-interpreter.t.hpp"
-# include "map.t.hpp"
-# include "skill.t.hpp"
+#include "../net/timer.t.hpp"
 
+#include "clif.t.hpp"
+#include "map.t.hpp"
+#include "skill.t.hpp"
+
+
+namespace tmwa
+{
 // ダメージ
 struct Damage
 {
@@ -44,10 +48,6 @@ struct Damage
     ATK dmg_lv;
 };
 
-struct map_session_data;
-struct mob_data;
-struct block_list;
-
 // ダメージ計算
 
 struct Damage battle_calc_attack(BF attack_type,
@@ -69,7 +69,7 @@ ATK battle_weapon_attack(dumb_ptr<block_list> bl, dumb_ptr<block_list> target,
         tick_t tick);
 
 int battle_is_unarmed(dumb_ptr<block_list> bl);
-int battle_get_class(dumb_ptr<block_list> bl);
+Species battle_get_class(dumb_ptr<block_list> bl);
 DIR battle_get_dir(dumb_ptr<block_list> bl);
 int battle_get_lv(dumb_ptr<block_list> bl);
 int battle_get_range(dumb_ptr<block_list> bl);
@@ -95,7 +95,7 @@ Element battle_get_elem_type(dumb_ptr<block_list> bl)
 {
     return battle_get_element(bl).element;
 }
-int battle_get_party_id(dumb_ptr<block_list> bl);
+PartyId battle_get_party_id(dumb_ptr<block_list> bl);
 Race battle_get_race(dumb_ptr<block_list> bl);
 MobMode battle_get_mode(dumb_ptr<block_list> bl);
 int battle_get_stat(SP stat_id, dumb_ptr<block_list> bl);
@@ -225,5 +225,4 @@ extern struct Battle_Config
 
 bool battle_config_read(ZString cfgName);
 void battle_config_check();
-
-#endif // TMWA_MAP_BATTLE_HPP
+} // namespace tmwa