[Refactor] #38861 cptr を concptrに改名 / rename cptr to concptr.

[hengbandforosx/hengbandosx.git] / src / trap.c

diff --git a/src/trap.c b/src/trap.c
index e72683d..13e189c 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,12 +38,12 @@ 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
 */\r
-s16b choose_random_trap(void)\r
+FEAT_IDX choose_random_trap(void)\r
 {\r
        FEAT_IDX feat;\r
 \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
@@ -167,8 +166,8 @@ static int check_hit(int power)
 static void hit_trap_pit(int trap_feat_type)\r
 {\r
        HIT_POINT dam;\r
-       cptr trap_name = "";\r
-       cptr spike_name = "";\r
+       concptr trap_name = "";\r
+       concptr spike_name = "";\r
 \r
        switch (trap_feat_type)\r
        {\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
@@ -279,7 +277,7 @@ static void hit_trap_slow(void)
 * @param turn 状態異常の追加ターン量\r
 * @return なし\r
 */\r
-static void hit_trap_set_abnormal_status(cptr trap_message, bool resist, bool(*set_status)(IDX), IDX turn_aux)\r
+static void hit_trap_set_abnormal_status(concptr trap_message, bool resist, bool(*set_status)(IDX), IDX turn_aux)\r
 {\r
        msg_print(trap_message);\r
        if (!resist)\r
@@ -303,14 +301,13 @@ void hit_trap(bool break_trap)
        cave_type *c_ptr = &cave[y][x];\r
        feature_type *f_ptr = &f_info[c_ptr->feat];\r
        int trap_feat_type = have_flag(f_ptr->flags, FF_TRAP) ? f_ptr->subtype : NOT_TRAP;\r
-       cptr name = _("トラップ", "a trap");\r
+       concptr 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
@@ -358,7 +355,7 @@ void hit_trap(bool break_trap)
                num = 2 + randint1(3);\r
                for (i = 0; i < num; i++)\r
                {\r
-                       (void)summon_specific(0, y, x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));\r
+                       (void)summon_specific(0, y, x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0');\r
                }\r
 \r
                if (dun_level > randint1(100)) /* No nasty effect for low levels */\r
@@ -520,10 +517,10 @@ void hit_trap(bool break_trap)
                                /* Require line of projection */\r
                                if (!projectable(p_ptr->y, p_ptr->x, y1, x1)) continue;\r
 \r
-                               if (summon_specific(0, y1, x1, lev, SUMMON_ARMAGE_EVIL, (PM_NO_PET)))\r
+                               if (summon_specific(0, y1, x1, lev, SUMMON_ARMAGE_EVIL, (PM_NO_PET), '\0'))\r
                                        evil_idx = hack_m_idx_ii;\r
 \r
-                               if (summon_specific(0, y1, x1, lev, SUMMON_ARMAGE_GOOD, (PM_NO_PET)))\r
+                               if (summon_specific(0, y1, x1, lev, SUMMON_ARMAGE_GOOD, (PM_NO_PET), '\0'))\r
                                {\r
                                        good_idx = hack_m_idx_ii;\r
                                }\r
@@ -554,7 +551,7 @@ void hit_trap(bool break_trap)
                num = 1 + dun_level / 20;\r
                for (i = 0; i < num; i++)\r
                {\r
-                       (void)summon_specific(0, y, x, dun_level, SUMMON_PIRANHAS, (PM_ALLOW_GROUP | PM_NO_PET));\r
+                       (void)summon_specific(0, y, x, dun_level, SUMMON_PIRANHAS, (PM_ALLOW_GROUP | PM_NO_PET), '\0');\r
                }\r
                break;\r
        }\r