[Refactor] #38997 conv_dungeon_feat() に floor_type * 引数を追加． / Add floor_type * argume...

[hengband/hengband.git] / src / combat / melee.h

diff --git a/src/combat/melee.h b/src/combat/melee.h
index 4fbbe95..5a07e26 100644 (file)
--- a/src/combat/melee.h
+++ b/src/combat/melee.h
@@ -1,5 +1,5 @@
 
-typedef int COMBAT_OPTION_IDX; // py_attack()用コンバットオプション型定義
+typedef int COMBAT_OPTION_IDX; // py_attack(p_ptr, )用コンバットオプション型定義
 
 
 #ifdef JP
@@ -152,11 +152,11 @@ extern const int monk_ave_damage[PY_MAX_LEVEL + 1][3];
 
 extern bool test_hit_norm(HIT_RELIABILITY chance, ARMOUR_CLASS ac, bool visible);
 extern PERCENTAGE hit_chance(HIT_RELIABILITY chance, ARMOUR_CLASS ac);
-extern HIT_POINT tot_dam_aux(object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown);
-extern HIT_POINT critical_norm(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, BIT_FLAGS mode);
-extern bool py_attack(POSITION y, POSITION x, COMBAT_OPTION_IDX mode);
-extern bool make_attack_normal(MONSTER_IDX m_idx);
+extern HIT_POINT tot_dam_aux(player_type *attacker_ptr, object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown);
+extern HIT_POINT critical_norm(player_type *attacker_ptr, WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, BIT_FLAGS mode);
+extern bool py_attack(player_type *attacker_ptr, POSITION y, POSITION x, COMBAT_OPTION_IDX mode);
+extern bool make_attack_normal(player_type *targer_ptr, MONSTER_IDX m_idx);
 extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, MONSTER_IDX who);
-extern bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx);
+extern bool monst_attack_monst(player_type *subject_ptr, MONSTER_IDX m_idx, MONSTER_IDX t_idx);
 
 extern const mbe_info_type mbe_info[];