[Refactor] #39912 不要インクルードファイル整理中． / Refactoring unused include files.

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

diff --git a/src/player-damage.c b/src/player-damage.c
index 351161f..8bc29ea 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -4,6 +4,7 @@
 #include "term.h"
 
 #include "avatar.h"
+#include "bldg.h"
 #include "cmd-dump.h"
 #include "realm-song.h"
 #include "floor.h"
@@ -17,6 +18,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-class.h"
+#include "player-race.h"
 #include "monster-spell.h"
 #include "world.h"
 #include "view-mainwindow.h"
@@ -77,7 +79,7 @@ void inventory_damage(player_type *player_ptr, inven_func typ, int perc)
                /* Some casualities */
                if (!amt) continue;
                
-               object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
+               object_desc(player_ptr, o_name, o_ptr, OD_OMIT_PREFIX);
 
                msg_format(_("%s(%c)が%s壊れてしまった！", "%sour %s (%c) %s destroyed!"),
 #ifdef JP
@@ -144,12 +146,12 @@ static bool acid_minus_ac(player_type *creature_ptr)
        if (!o_ptr->k_idx) return FALSE;
        if (!object_is_armour(o_ptr)) return FALSE;
 
-       object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+       object_desc(creature_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
        object_flags(o_ptr, flgs);
        /* No damage left to be done */
        if (o_ptr->ac + o_ptr->to_a <= 0)
        {
-               msg_format(_("%sは既にボロボロだ！", "is already fully corroded!"), o_name);
+               msg_format(_("%sは既にボロボロだ！", "Your %s is already fully corroded!"), o_name);
                return FALSE;
        }
 
@@ -484,7 +486,8 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
        {
                bool android = (creature_ptr->prace == RACE_ANDROID ? TRUE : FALSE);
 
-#ifdef JP       /* 死んだ時に強制終了して死を回避できなくしてみた by Habu */
+#ifdef JP
+               /* 死んだ時に強制終了して死を回避できなくしてみた by Habu */
                if (!cheat_save)
                        if (!save_player(creature_ptr)) msg_print("セーブ失敗！");
 #endif