[Refactor] #38997 'while (1)' を 'while (TRUE)' に変更 / Changed 'while (1)' to 'while...

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

diff --git a/src/trap.c b/src/trap.c
index 24c9385..590f4db 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -149,7 +149,7 @@ FEAT_IDX choose_random_trap(floor_type *floor_ptr)
        FEAT_IDX feat;
 
        /* Pick a trap */
-       while (1)
+       while (TRUE)
        {
                /* Hack -- pick a trap */
                feat = normal_traps[randint0(MAX_NORMAL_TRAPS)];
@@ -169,21 +169,23 @@ FEAT_IDX choose_random_trap(floor_type *floor_ptr)
        return feat;
 }
 
+
 /*!
 * @brief マスに存在する隠しトラップを公開する /
 * Disclose an invisible trap
+* @param player
 * @param y 秘匿したいマスのY座標
 * @param x 秘匿したいマスのX座標
 * @return なし
 */
-void disclose_grid(floor_type *floor_ptr, POSITION y, POSITION x)
+void disclose_grid(player_type *trapped_ptr, POSITION y, POSITION x)
 {
-       grid_type *g_ptr = &floor_ptr->grid_array[y][x];
+       grid_type *g_ptr = &trapped_ptr->current_floor_ptr->grid_array[y][x];
 
        if (cave_have_flag_grid(g_ptr, FF_SECRET))
        {
                /* No longer hidden */
-               cave_alter_feat(y, x, FF_SECRET);
+               cave_alter_feat(trapped_ptr, y, x, FF_SECRET);
        }
        else if (g_ptr->mimic)
        {
@@ -195,6 +197,7 @@ void disclose_grid(floor_type *floor_ptr, POSITION y, POSITION x)
        }
 }
 
+
 /*!
 * @brief マスをトラップを配置する /
 * The location must be a legal, naked, floor grid.
@@ -243,19 +246,19 @@ static int check_hit(player_type *target_ptr, int power)
        if (k < 10) return (k < 5);
 
        if (target_ptr->pseikaku == SEIKAKU_NAMAKE)
-               if (one_in_(20)) return (TRUE);
+               if (one_in_(20)) return TRUE;
 
        /* Paranoia -- No power */
-       if (power <= 0) return (FALSE);
+       if (power <= 0) return FALSE;
 
        /* Total armor */
        ac = target_ptr->ac + target_ptr->to_a;
 
        /* Power competes against Armor */
-       if (randint1(power) > ((ac * 3) / 4)) return (TRUE);
+       if (randint1(power) > ((ac * 3) / 4)) return TRUE;
 
        /* Assume miss */
-       return (FALSE);
+       return FALSE;
 }
 
 
@@ -413,7 +416,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
 
        disturb(trapped_ptr, FALSE, TRUE);
 
-       cave_alter_feat(y, x, FF_HIT_TRAP);
+       cave_alter_feat(trapped_ptr, y, x, FF_HIT_TRAP);
 
        /* Analyze */
        switch (trap_feat_type)
@@ -667,7 +670,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
 
        if (break_trap && is_trap(g_ptr->feat))
        {
-               cave_alter_feat(y, x, FF_DISARM);
+               cave_alter_feat(trapped_ptr, y, x, FF_DISARM);
                msg_print(_("トラップを粉砕した。", "You destroyed the trap."));
        }
 }