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

[hengband/hengband.git] / src / object1.c

diff --git a/src/object1.c b/src/object1.c
index 27a517f..0ed6548 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1317,12 +1317,12 @@ char index_to_label(int i)
  * @return 対応するID。該当スロットにオブジェクトが存在しなかった場合-1を返す / Return "-1" if the label does not indicate a real item
  * @details Note that the label does NOT distinguish inven/equip.
  */
-s16b label_to_inven(int c)
+INVENTORY_IDX label_to_inven(int c)
 {
-       int i;
+       INVENTORY_IDX i;
 
        /* Convert */
-       i = (islower(c) ? A2I(c) : -1);
+       i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1);
 
        /* Verify the index */
        if ((i < 0) || (i > INVEN_PACK)) return (-1);
@@ -1355,12 +1355,12 @@ static bool is_ring_slot(int i)
  * Convert a label into the index of a item in the "equip"
  * @return 対応するID。該当スロットにオブジェクトが存在しなかった場合-1を返す / Return "-1" if the label does not indicate a real item
  */
-s16b label_to_equip(int c)
+INVENTORY_IDX label_to_equip(int c)
 {
-       int i;
+       INVENTORY_IDX i;
 
        /* Convert */
-       i = (islower(c) ? A2I(c) : -1) + INVEN_RARM;
+       i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1) + INVEN_RARM;
 
        /* Verify the index */
        if ((i < INVEN_RARM) || (i >= INVEN_TOTAL)) return (-1);
@@ -1589,7 +1589,7 @@ cptr describe_use(int i)
  * @return 使用可能な魔法書ならばTRUEを返す。
  */
 
-bool check_book_realm(const byte book_tval, const byte book_sval)
+bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VALUE book_sval)
 {
        if (book_tval < TV_LIFE_BOOK) return FALSE;
        if (p_ptr->pclass == CLASS_SORCERER)
@@ -1856,9 +1856,10 @@ void display_equip(void)
  * Also, the tag "@xn" will work as well, where "n" is a any tag-char,\n
  * and "x" is the "current" command_cmd code.\n
  */
-static bool get_tag(int *cp, char tag, int mode)
+static bool get_tag(COMMAND_CODE *cp, char tag, int mode)
 {
-       int i, start, end;
+       COMMAND_CODE i;
+       int start, end;
        cptr s;
 
        /* Extract index from mode */
@@ -1981,9 +1982,9 @@ static bool get_tag(int *cp, char tag, int mode)
  * Also, the tag "@xn" will work as well, where "n" is a any tag-char,\n
  * and "x" is the "current" command_cmd code.\n
  */
-static bool get_tag_floor(int *cp, char tag, int floor_list[], int floor_num)
+static bool get_tag_floor(COMMAND_CODE *cp, char tag, int floor_list[], int floor_num)
 {
-       int i;
+       COMMAND_CODE i;
        cptr s;
 
        /**** Find a tag in the form of {@x#} (allow alphabet tag) ***/
@@ -2117,7 +2118,7 @@ static void prepare_label_string_floor(char *label, int floor_list[], int floor_
        /* Move each label */
        for (i = 0; i < 52; i++)
        {
-               int index;
+               COMMAND_CODE index;
                char c = alphabet_chars[i];
 
                /* Find a tag with this label */
@@ -2718,13 +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(int *cp, cptr pmt, cptr str, int mode)
+bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
 {
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        char which = ' ';
 
-       int j, k, i1, i2, e1, e2;
+       int j;
+       COMMAND_CODE k;
+       COMMAND_CODE i1, i2;
+       COMMAND_CODE e1, e2;
 
        bool done, item;
 
@@ -2984,7 +2988,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        /* Repeat until done */
        while (!done)
        {
-               int get_item_label = 0;
+               COMMAND_CODE get_item_label = 0;
 
                /* Show choices */
                int ni = 0;
@@ -3759,11 +3763,14 @@ int show_floor(int target_item, int y, int x, int *min_width)
  * @param mode オプションフラグ
  * @return プレイヤーによりアイテムが選択されたならTRUEを返す。/
  */
-bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
+bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
 {
        char n1 = ' ', n2 = ' ', which = ' ';
 
-       int j, k, i1, i2, e1, e2;
+       int j;
+       COMMAND_CODE i1, i2;
+       COMMAND_CODE e1, e2;
+       COMMAND_CODE k;
 
        bool done, item;
 
@@ -4027,7 +4034,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        /* Repeat until done */
        while (!done)
        {
-               int get_item_label = 0;
+               COMMAND_CODE get_item_label = 0;
 
                /* Show choices */
                int ni = 0;
@@ -4526,7 +4533,8 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                        case '\r':
                        case '+':
                        {
-                               int i, o_idx;
+                               int i;
+                               IDX o_idx;
                                cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
 
                                if (command_wrk != (USE_FLOOR)) break;
@@ -5029,8 +5037,6 @@ void py_pickup_floor(bool pickup)
        /* Scan the pile of objects */
        for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               object_type *o_ptr;
-
                /* Access the object */
                o_ptr = &o_list[this_o_idx];
 
@@ -5048,14 +5054,13 @@ void py_pickup_floor(bool pickup)
                {
                        /* Message */
 #ifdef JP
-               msg_format(" $%ld の価値がある%sを見つけた。",
-                          (long)o_ptr->pval, o_name);
+                       msg_format(" $%ld の価値がある%sを見つけた。",
+                               (long)o_ptr->pval, o_name);
 #else
                        msg_format("You have found %ld gold pieces worth of %s.",
-                               (long) o_ptr->pval, o_name);
+                               (long)o_ptr->pval, o_name);
 #endif
 
-
                        /* Collect the gold */
                        p_ptr->au += o_ptr->pval;