From 456622daac909c961788ff0e130bde6cc980f4ed Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 10 Jan 2019 12:56:32 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?= =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd2.c | 4 +--- src/melee1.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cmd2.c b/src/cmd2.c index eda14bbff..046758407 100644 --- 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 acafa4b37..f985d850d 100644 --- 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); -- 2.11.0