[Refactor] #37353 コメント整理 / Refactor comments.

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

diff --git a/src/trap.c b/src/trap.c
index 8dfe430..9bb329f 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,5 +1,6 @@
 #include "angband.h"\r
 #include "trap.h"\r
+#include "player-damage.h"\r
 \r
 static s16b normal_traps[MAX_NORMAL_TRAPS];\r
 \r
@@ -37,7 +38,7 @@ void init_normal_traps(void)
 * Get random trap\r
 * @return 選択したトラップのID\r
 * @details\r
-* XXX XXX XXX This routine should be redone to reflect trap "level".\n\r
+* This routine should be redone to reflect trap "level".\n\r
 * That is, it does not make sense to have spiked pits at 50 feet.\n\r
 * Actually, it is not this routine, but the "trap instantiation"\n\r
 * code, which should also check for "trap doors" on quest levels.\n\r
@@ -88,10 +89,7 @@ void disclose_grid(POSITION y, POSITION x)
                /* No longer hidden */\r
                c_ptr->mimic = 0;\r
 \r
-               /* Notice */\r
                note_spot(y, x);\r
-\r
-               /* Redraw */\r
                lite_spot(y, x);\r
        }\r
 }\r
@@ -134,7 +132,8 @@ void place_trap(POSITION y, POSITION x)
 */\r
 static int check_hit(int power)\r
 {\r
-       int k, ac;\r
+       int k;\r
+       ARMOUR_CLASS ac;\r
 \r
        /* Percentile dice */\r
        k = randint0(100);\r
@@ -220,7 +219,6 @@ static void hit_trap_pit(int trap_feat_type)
                }\r
        }\r
 \r
-       /* Take the damage */\r
        take_hit(DAMAGE_NOESCAPE, dam, trap_name, -1);\r
 }\r
 \r
@@ -305,12 +303,11 @@ void hit_trap(bool break_trap)
        int trap_feat_type = have_flag(f_ptr->flags, FF_TRAP) ? f_ptr->subtype : NOT_TRAP;\r
        cptr name = _("トラップ", "a trap");\r
 \r
-       /* Disturb the player */\r
-       disturb(0, 1);\r
+       disturb(FALSE, TRUE);\r
 \r
        cave_alter_feat(y, x, FF_HIT_TRAP);\r
 \r
-       /* Analyze XXX XXX XXX */\r
+       /* Analyze */\r
        switch (trap_feat_type)\r
        {\r
        case TRAP_TRAPDOOR:\r