[Refactor] #37353 型の置換。 / Type replacement.

diff --git a/src/cmd2.c b/src/cmd2.c
index eda14bb..0467584 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -1475,7 +1475,7 @@ void do_cmd_disarm(void)
 {
        POSITION y, x;
        DIRECTION dir;
-       s16b o_idx;
+       OBJECT_IDX o_idx;
 
        bool more = FALSE;
 
@@ -1551,14 +1551,12 @@ void do_cmd_disarm(void)
                /* Disarm chest */
                else if (o_idx)
                {
-                       /* Disarm the chest */
                        more = do_cmd_disarm_chest(y, x, o_idx);
                }
 
                /* Disarm trap */
                else
                {
-                       /* Disarm the trap */
                        more = do_cmd_disarm_aux(y, x, dir);
                }
        }

diff --git a/src/melee1.c b/src/melee1.c
index acafa4b..f985d85 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2152,7 +2152,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Find an item */
                                        for (k = 0; k < 10; k++)
                                        {
-                                               s16b o_idx;
+                                               OBJECT_IDX o_idx;
 
                                                /* Pick an item */
                                                i = (INVENTORY_IDX)randint0(INVEN_PACK);