[Refactor] #2204 HIT_POINTエイリアスをintに揃えた

[hengbandforosx/hengbandosx.git] / src / mspell / mspell-damage-calculator.h

diff --git a/src/mspell/mspell-damage-calculator.h b/src/mspell/mspell-damage-calculator.h
index ebebddc..b1eed6d 100644 (file)
--- a/src/mspell/mspell-damage-calculator.h
+++ b/src/mspell/mspell-damage-calculator.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "mspell/mspell-type.h"
 #include "system/angband.h"
 
-typedef enum spell_flag_type {
+enum spell_flag_type {
        DAM_ROLL = 1,
     DAM_MAX = 2,
     DAM_MIN = 3,
@@ -12,8 +11,10 @@ typedef enum spell_flag_type {
     DICE_MULT = 6,
     DICE_DIV = 7,
     BASE_DAM = 8,
-} spell_flag_type;
+};
 
-HIT_POINT monspell_damage(player_type* target_ptr, monster_spell_type ms_type, MONSTER_IDX m_idx, int TYPE);
-HIT_POINT monspell_race_damage(player_type* target_ptr, monster_spell_type ms_type, MONRACE_IDX r_idx, int TYPE);
-HIT_POINT monspell_bluemage_damage(player_type* target_ptr, monster_spell_type ms_type, PLAYER_LEVEL plev, int TYPE);
+enum class MonsterAbilityType;
+class PlayerType;
+int monspell_damage(PlayerType *player_ptr, MonsterAbilityType ms_type, MONSTER_IDX m_idx, int TYPE);
+int monspell_race_damage(PlayerType *player_ptr, MonsterAbilityType ms_type, MONRACE_IDX r_idx, int TYPE);
+int monspell_bluemage_damage(PlayerType *player_ptr, MonsterAbilityType ms_type, PLAYER_LEVEL plev, int TYPE);