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 5110e98..67c59db 100644 (file)
--- a/src/player-damage.h
+++ b/src/player-damage.h
@@ -1,21 +1,4 @@
-#pragma once
-
-/* Multishadow effects is determined by current_world_ptr->game_turn */
-#define CHECK_MULTISHADOW() (p_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(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);