[Refactor] #38997 コード整形＆player_type * 引数を追加 / Reshaped codes and added player_type...

[hengband/hengband.git] / src / player-damage.h

diff --git a/src/player-damage.h b/src/player-damage.h
index 5110e98..5990fc2 100644 (file)
--- a/src/player-damage.h
+++ b/src/player-damage.h
@@ -1,7 +1,7 @@
 #pragma once
 
-/* Multishadow effects is determined by current_world_ptr->game_turn */
-#define CHECK_MULTISHADOW() (p_ptr->multishadow && (current_world_ptr->game_turn & 1))
+/* Multishadow effects is determined by turn */
+#define CHECK_MULTISHADOW(CRE_PTR) ((CRE_PTR)->multishadow && (current_world_ptr->game_turn & 1))
 
 #define DAMAGE_FORCE    1
 #define DAMAGE_GENO     2
@@ -9,23 +9,15 @@
 #define DAMAGE_ATTACK   4
 #define DAMAGE_NOESCAPE 5
 #define DAMAGE_USELIFE  6
-extern int take_hit(int damage_type, HIT_POINT damage, concptr kb_str, int monspell);
+extern int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concptr kb_str, int monspell);
 
 /*
  * This seems like a pretty standard "typedef"
  */
 typedef int(*inven_func)(object_type *);
 
-extern bool hates_acid(object_type *o_ptr);
-extern bool hates_elec(object_type *o_ptr);
-extern bool hates_fire(object_type *o_ptr);
-extern bool hates_cold(object_type *o_ptr);
-extern int set_acid_destroy(object_type *o_ptr);
-extern int set_elec_destroy(object_type *o_ptr);
-extern int set_fire_destroy(object_type *o_ptr);
-extern int set_cold_destroy(object_type *o_ptr);
-extern int inven_damage(inven_func typ, int perc);
-extern HIT_POINT acid_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura);
-extern HIT_POINT elec_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura);
-extern HIT_POINT fire_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura);
-extern HIT_POINT cold_dam(HIT_POINT dam, concptr kb_str, int monspell, bool aura);
+extern void inventory_damage(player_type *creature_ptr, inven_func typ, int perc);
+extern HIT_POINT acid_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura);
+extern HIT_POINT elec_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura);
+extern HIT_POINT fire_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura);
+extern HIT_POINT cold_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura);