[Refactor] #38862 Moved spells-* to spell/

[hengband/hengband.git] / src / warning.c

diff --git a/src/warning.c b/src/warning.c
index 90d2f22..c1bf5ac 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -1,22 +1,21 @@
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
 
 #include "artifact.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "feature.h"
-#include "floor.h"
+#include "floor/floor.h"
 #include "warning.h"
-#include "player-status.h"
-#include "monster.h"
-#include "monster-spell.h"
-#include "spells.h"
-#include "object-flavor.h"
-#include "dungeon.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "monster/monster.h"
+#include "spell/monster-spell.h"
+#include "spell/spells-type.h"
+#include "object/object-flavor.h"
+#include "dungeon/dungeon.h"
+#include "player/mimic-info-table.h"
+#include "player/player-class.h"
 #include "melee.h"
-#include "realm-song.h"
 
 /*!
  * @brief 警告を放つアイテムを選択する /
@@ -502,7 +501,7 @@ bool process_warning(player_type *creature_ptr, POSITION xx, POSITION yy)
                        object_type *o_ptr = choose_warning_item(creature_ptr);
 
                        if (o_ptr)
-                               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));
                        else
                                strcpy(o_name, _("体", "body")); /* Warning ability without item */
                        msg_format(_("%sが鋭く震えた！", "Your %s pulsates sharply!"), o_name);
@@ -514,13 +513,13 @@ bool process_warning(player_type *creature_ptr, POSITION xx, POSITION yy)
        else old_damage = old_damage / 2;
 
        g_ptr = &creature_ptr->current_floor_ptr->grid_array[yy][xx];
-       bool is_warning = (!easy_disarm && is_trap(g_ptr->feat)) || (g_ptr->mimic && is_trap(g_ptr->feat));
-       is_warning = !one_in_(13);
+       bool is_warning = (!easy_disarm && is_trap(creature_ptr, g_ptr->feat)) || (g_ptr->mimic && is_trap(creature_ptr, g_ptr->feat));
+       is_warning &= !one_in_(13);
        if (!is_warning) return TRUE;
 
        object_type *o_ptr = choose_warning_item(creature_ptr);
        if (o_ptr != NULL)
-               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));
        else
                strcpy(o_name, _("体", "body")); /* Warning ability without item */
        msg_format(_("%sが鋭く震えた！", "Your %s pulsates sharply!"), o_name);