[Refactor] #38997 disclose_grid() に floor_type * 引数を追加 / Added floor_type * argument...

diff --git a/src/player-move.c b/src/player-move.c
index f0fc883..bbf03b6 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -195,7 +195,7 @@ static void discover_hidden_things(POSITION y, POSITION x)
        /* Invisible trap */
        if (g_ptr->mimic && is_trap(g_ptr->feat))
        {
-               disclose_grid(y, x);
+               disclose_grid(p_ptr->current_floor_ptr, y, x);
                msg_print(_("トラップを発見した。", "You have found a trap."));
                disturb(p_ptr, FALSE, TRUE);
        }
@@ -204,7 +204,7 @@ static void discover_hidden_things(POSITION y, POSITION x)
        if (is_hidden_door(g_ptr))
        {
                msg_print(_("隠しドアを発見した。", "You have found a secret door."));
-               disclose_grid(y, x);
+               disclose_grid(p_ptr->current_floor_ptr, y, x);
                disturb(p_ptr, FALSE, FALSE);
        }
 
@@ -776,7 +776,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
                        msg_print(_("トラップだ！", "You found a trap!"));
 
                        /* Pick a trap */
-                       disclose_grid(creature_ptr->y, creature_ptr->x);
+                       disclose_grid(creature_ptr->current_floor_ptr, creature_ptr->y, creature_ptr->x);
                }
 
                /* Hit the trap */

diff --git a/src/spells1.c b/src/spells1.c
index 184876d..fa09554 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -373,7 +373,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        if (is_hidden_door(g_ptr))
                        {
                                /* Pick a door */
-                               disclose_grid(y, x);
+                               disclose_grid(caster_ptr->current_floor_ptr, y, x);
 
                                /* Check line of sight */
                                if (known)

diff --git a/src/spells2.c b/src/spells2.c
index 12c442d..db849a1 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -98,7 +98,7 @@ static bool detect_feat_flag(player_type *caster_ptr, POSITION range, int flag,
 
                        if (cave_have_flag_grid(g_ptr, flag))
                        {
-                               disclose_grid(y, x);
+                               disclose_grid(caster_ptr->current_floor_ptr, y, x);
                                g_ptr->info |= (CAVE_MARK);
                                lite_spot(y, x);
                                detect = TRUE;

diff --git a/src/trap.c b/src/trap.c
index 05a91b8..2f0c665 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -176,9 +176,9 @@ FEAT_IDX choose_random_trap(floor_type *floor_ptr)
 * @param x 秘匿したいマスのX座標
 * @return なし
 */
-void disclose_grid(POSITION y, POSITION x)
+void disclose_grid(floor_type *floor_ptr, POSITION y, POSITION x)
 {
-       grid_type *g_ptr = &p_ptr->current_floor_ptr->grid_array[y][x];
+       grid_type *g_ptr = &floor_ptr->grid_array[y][x];
 
        if (cave_have_flag_grid(g_ptr, FF_SECRET))
        {

diff --git a/src/trap.h b/src/trap.h
index 5283f46..ad55b12 100644 (file)
--- a/src/trap.h
+++ b/src/trap.h
@@ -1,7 +1,7 @@
 
 extern void init_normal_traps(void);
 extern FEAT_IDX choose_random_trap(floor_type *floor_ptr);
-extern void disclose_grid(POSITION y, POSITION x);
+extern void disclose_grid(floor_type *floor_ptr, POSITION y, POSITION x);
 extern void place_trap(floor_type *floor_ptr, POSITION y, POSITION x);
 extern void hit_trap(player_type *trapped_ptr, bool break_trap);