Revert "Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband"

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

diff --git a/src/player-damage.h b/src/player-damage.h
index 5990fc2..67c59db 100644 (file)
--- a/src/player-damage.h
+++ b/src/player-damage.h
@@ -1,23 +1,14 @@
-#pragma once
-
-/* 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
-#define DAMAGE_LOSELIFE 3
-#define DAMAGE_ATTACK   4
-#define DAMAGE_NOESCAPE 5
-#define DAMAGE_USELIFE  6
-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 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);
+
+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);