#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

diff --git a/src/cmd3.c b/src/cmd3.c
index d335355..fb1bbe9 100644 (file)
--- 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 2beea34..fcf394e 100644 (file)
--- 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 3b3d09a..5b2453c 100644 (file)
--- 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;