From 0ab66085b181d0d4169985827efe930306a461a1 Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 19 Oct 2017 21:45:54 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82=20/=20Ongoing=20type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd3.c | 2 +- src/externs.h | 2 +- src/object1.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cmd3.c b/src/cmd3.c index d33535583..fb1bbe9a2 100644 --- a/src/cmd3.c +++ b/src/cmd3.c @@ -221,7 +221,7 @@ bool select_ring_slot = FALSE; */ void do_cmd_wield(void) { - int item, slot; + OBJECT_IDX item, slot; object_type forge; object_type *q_ptr; diff --git a/src/externs.h b/src/externs.h index 2beea341c..fcf394e85 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1018,7 +1018,7 @@ extern int show_inven(int target_item); extern int show_equip(int target_item); extern void toggle_inven_equip(void); extern bool can_get_item(void); -extern bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode); +extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode); /* object2.c */ extern void excise_object_idx(int o_idx); diff --git a/src/object1.c b/src/object1.c index 3b3d09ab9..5b2453cd1 100644 --- a/src/object1.c +++ b/src/object1.c @@ -2629,7 +2629,7 @@ static bool get_item_allow(int item) * @param i 選択アイテムID * @return 正規のIDならばTRUEを返す。 */ -static bool get_item_okay(int i) +static bool get_item_okay(OBJECT_IDX i) { /* Illegal items */ if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE); @@ -2719,16 +2719,16 @@ bool can_get_item(void) * We always erase the prompt when we are done, leaving a blank line,\n * or a warning message, if appropriate, if no items are available.\n */ -bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode) +bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode) { OBJECT_IDX this_o_idx, next_o_idx = 0; char which = ' '; int j; - COMMAND_CODE k; - COMMAND_CODE i1, i2; - COMMAND_CODE e1, e2; + OBJECT_IDX k; + OBJECT_IDX i1, i2; + OBJECT_IDX e1, e2; bool done, item; -- 2.11.0