#37287 #37353 (2.2.0.89) TERM_COLOR 型を定義し、型の置換を継続中。 / Define TERM_COLOR, ongoing...

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

diff --git a/src/object1.c b/src/object1.c
index 9800f53..7391450 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1858,7 +1858,8 @@ void display_equip(void)
  */
 static bool get_tag(COMMAND_CODE *cp, char tag, int mode)
 {
-       int i, start, end;
+       COMMAND_CODE i;
+       COMMAND_CODE start, end;
        cptr s;
 
        /* Extract index from mode */
@@ -1981,9 +1982,9 @@ static bool get_tag(COMMAND_CODE *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) ***/
@@ -2080,7 +2081,7 @@ static void prepare_label_string(char *label, int mode)
        /* 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 */
@@ -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 */
@@ -2141,18 +2142,19 @@ static void prepare_label_string_floor(char *label, int floor_list[], int floor_
  * @details
  * Hack -- do not display "trailing" empty slots
  */
-int show_inven(int target_item)
+COMMAND_CODE show_inven(int target_item)
 {
-       int             i, j, k, l, z = 0;
+       COMMAND_CODE i;
+       int j, k, l, z = 0;
        int             col, cur_col, len;
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
        char            tmp_val[80];
-       int             out_index[23];
+       COMMAND_CODE out_index[23];
        byte            out_color[23];
        char            out_desc[23][MAX_NLEN];
-       int             target_item_label = 0;
-       int             wid, hgt;
+       COMMAND_CODE target_item_label = 0;
+       TERM_POSITION wid, hgt;
        char            inven_label[52 + 1];
 
        /* Starting column */
@@ -2307,18 +2309,19 @@ int show_inven(int target_item)
  * @param target_item アイテムの選択処理を行うか否か。
  * @return 選択したアイテムのタグ
  */
-int show_equip(int target_item)
+COMMAND_CODE show_equip(int target_item)
 {
-       int             i, j, k, l;
+       COMMAND_CODE i;
+       int j, k, l;
        int             col, cur_col, len;
        object_type     *o_ptr;
        char            tmp_val[80];
        char            o_name[MAX_NLEN];
-       int             out_index[23];
+       COMMAND_CODE out_index[23];
        byte            out_color[23];
        char            out_desc[23][MAX_NLEN];
-       int             target_item_label = 0;
-       int             wid, hgt;
+       COMMAND_CODE target_item_label = 0;
+       TERM_POSITION wid, hgt;
        char            equip_label[52 + 1];
 
        /* Starting column */
@@ -2628,7 +2631,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);
@@ -2718,15 +2721,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;
-       int i1, i2, e1, e2;
+       OBJECT_IDX k;
+       OBJECT_IDX i1, i2;
+       OBJECT_IDX e1, e2;
 
        bool done, item;
 
@@ -2986,7 +2990,7 @@ bool get_item(COMMAND_CODE *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;
@@ -3455,7 +3459,7 @@ bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
 
                                /* Extract "query" setting */
                                ver = isupper(which);
-                               which = tolower(which);
+                               which = (char)tolower(which);
 
                                /* Convert letter to inventory index */
                                if (!command_wrk)
@@ -3574,7 +3578,7 @@ bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
  *             mode & 0x02 -- Marked items only
  *             mode & 0x04 -- Stop after first
  */
-int scan_floor(int *items, int y, int x, int mode)
+int scan_floor(int *items, POSITION y, POSITION x, int mode)
 {
        int this_o_idx, next_o_idx;
 
@@ -3622,12 +3626,13 @@ int scan_floor(int *items, int y, int x, int mode)
  * @param y 走査するフロアのY座標
  * @param x 走査するフロアのX座標
  * @param min_width 表示の長さ
- * @return 選択したアイテムのID
+ * @return 選択したアイテムの添え字
  * @details
  */
-int show_floor(int target_item, int y, int x, int *min_width)
+COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_POSITION *min_width)
 {
-       int i, j, k, l;
+       COMMAND_CODE i;
+       int j, k, l;
        int col, len;
 
        object_type *o_ptr;
@@ -3636,10 +3641,10 @@ int show_floor(int target_item, int y, int x, int *min_width)
 
        char tmp_val[80];
 
-       int out_index[23];
+       COMMAND_CODE out_index[23];
        byte out_color[23];
        char out_desc[23][MAX_NLEN];
-       int target_item_label = 0;
+       COMMAND_CODE target_item_label = 0;
 
        int floor_list[23], floor_num;
        int wid, hgt;
@@ -3761,11 +3766,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;
 
@@ -3786,7 +3794,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        char out_val[160];
 
        int floor_num, floor_list[23], floor_top = 0;
-       int min_width = 0;
+       TERM_POSITION min_width = 0;
 
        extern bool select_the_force;
 
@@ -4029,7 +4037,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;
@@ -4863,7 +4871,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 
                                /* Extract "query" setting */
                                ver = isupper(which);
-                               which = tolower(which);
+                               which = (char)tolower(which);
 
                                /* Convert letter to inventory index */
                                if (command_wrk == (USE_INVEN))
@@ -4983,11 +4991,11 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
  */
 static bool py_pickup_floor_aux(void)
 {
-       s16b this_o_idx;
+       OBJECT_IDX this_o_idx;
 
        cptr q, s;
 
-       int item;
+       OBJECT_IDX item;
 
        /* Restrict the choices */
        item_tester_hook = inven_carry_okay;