[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 9bb329f..13e189c 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -166,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
@@ -277,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
@@ -301,7 +301,7 @@ 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(FALSE, TRUE);\r
 \r
@@ -355,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
@@ -517,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
@@ -551,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