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

diff --git a/src/cmd1.c b/src/cmd1.c
index 7056f27..6c9e170 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -494,9 +494,9 @@ static int mult_brand(int mult, const u32b* flgs, const monster_type* m_ptr)
  */
 s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bool thrown)
 {
-       int mult = 10;
+       MULTIPLY mult = 10;
 
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        /* Extract the flags */
        object_flags(o_ptr, flgs);

diff --git a/src/externs.h b/src/externs.h
index 1aabba8..a4b01b0 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -153,7 +153,7 @@ extern COMMAND_ARG command_arg;
 extern s16b command_rep;
 extern DIRECTION command_dir;
 extern s16b command_see;
-extern s16b command_gap;
+extern TERM_POSITION command_gap;
 extern s16b command_wrk;
 extern s16b command_new;
 extern bool msg_flag;
@@ -1683,8 +1683,8 @@ extern bool do_cmd_disarm_aux(int y, int x, int dir);
 #ifdef ALLOW_EASY_FLOOR /* TNB */
 
 /* object1.c */
-extern int scan_floor(int *items, int y, int x, int mode);
-extern COMMAND_CODE show_floor(int target_item, int y, int x, int *min_width);
+extern int scan_floor(int *items, POSITION y, POSITION x, int mode);
+extern COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_POSITION *min_width);
 extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode);
 extern void py_pickup_floor(bool pickup);
 

diff --git a/src/h-type.h b/src/h-type.h
index b68dfee..86d59eb 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -140,6 +140,8 @@ typedef s16b PLAYER_LEVEL;  /*!< ゲーム中のプレイヤーレベルの型
 typedef int DIRECTION;         /*!< ゲーム中の方角の型定義 */
 typedef s32b EXP;                      /*!< ゲーム中の主経験値の型定義 */
 typedef s16b SUB_EXP;          /*!< ゲーム中の副経験値の型定義 */
+typedef s16b TERM_COLOR;       /*!< テキスト表示色の型定義 */
+
 
 typedef s32b OBJECT_TYPE_VALUE;    /*!< ゲーム中のアイテム主分類の型定義 */
 typedef s32b OBJECT_SUBTYPE_VALUE; /*!< ゲーム中のアイテム副分類の型定義 */

diff --git a/src/hissatsu.c b/src/hissatsu.c
index 6626efd..292d768 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -650,7 +650,7 @@ MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, int
        /* Bloody Maelstrom */
        if ((mode == HISSATSU_SEKIRYUKA) && p_ptr->cut && monster_living(r_ptr))
        {
-               int tmp = MIN(100, MAX(10, p_ptr->cut / 10));
+               MULTIPLY tmp = MIN(100, MAX(10, p_ptr->cut / 10));
                if (mult < tmp) mult = tmp;
        }
 

diff --git a/src/load.c b/src/load.c
index db94d99..dfb4fe8 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -3595,8 +3595,10 @@ static errr rd_savefile_new_aux(void)
                                    (!z_older_than(10, 3, 14) && (q_ptr->status == QUEST_STATUS_COMPLETED)) ||
                                    (!z_older_than(11, 0, 7) && (i >= MIN_RANDOM_QUEST) && (i <= (MIN_RANDOM_QUEST + max_rquests_load))))
                                {
-                                       rd_s16b(&q_ptr->cur_num);
-                                       rd_s16b(&q_ptr->max_num);
+                                       rd_s16b(&tmp16s);
+                                       q_ptr->cur_num = (MONSTER_NUMBER)tmp16s;
+                                       rd_s16b(&tmp16s);
+                                       q_ptr->max_num = (MONSTER_NUMBER)tmp16s;
                                        rd_s16b(&q_ptr->type);
 
                                        /* Load quest monster index */

diff --git a/src/object1.c b/src/object1.c
index d64a03d..7391450 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2150,7 +2150,7 @@ COMMAND_CODE show_inven(int target_item)
        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];
        COMMAND_CODE target_item_label = 0;
@@ -2317,7 +2317,7 @@ COMMAND_CODE show_equip(int target_item)
        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];
        COMMAND_CODE target_item_label = 0;
@@ -3459,7 +3459,7 @@ bool get_item(OBJECT_IDX *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)
@@ -3578,7 +3578,7 @@ bool get_item(OBJECT_IDX *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;
 
@@ -3629,9 +3629,10 @@ int scan_floor(int *items, int y, int x, int mode)
  * @return 選択したアイテムの添え字
  * @details
  */
-COMMAND_CODE 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;
@@ -3640,7 +3641,7 @@ COMMAND_CODE 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];
        COMMAND_CODE target_item_label = 0;
@@ -3793,7 +3794,7 @@ bool get_item_floor(COMMAND_CODE *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;
 

diff --git a/src/variable.c b/src/variable.c
index 852b0fe..bee1154 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -103,7 +103,7 @@ DIRECTION command_dir;              /* Gives direction of current command */
 s16b command_see;              /* See "object1.c" */
 s16b command_wrk;              /* See "object1.c" */
 
-s16b command_gap = 999;         /* See "object1.c" */
+TERM_POSITION command_gap = 999;         /* See "object1.c" */
 
 s16b command_new;              /* Command chaining from inven/equip view */