#37287 #37353 (2.2.0.89) TERM_POSITION, SYMBOL_COLOR, SYMBOL_CODE, COMMAND_CODE 型を定義し...

diff --git a/src/chuukei.c b/src/chuukei.c
index 0aba397..dcf449d 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -932,7 +932,8 @@ static bool flush_ringbuf_client(void)
        while (get_nextbuf(buf))
        {
                char id;
-               int x, y, len, col;
+               int x, y, len;
+               SYMBOL_COLOR col;
                int i;
                unsigned char tmp1, tmp2, tmp3, tmp4;
                char *mesg;

diff --git a/src/cmd2.c b/src/cmd2.c
index a1e7fa4..4df7daf 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -4441,8 +4441,8 @@ void do_cmd_throw(void)
 
 static int flow_head = 0;
 static int flow_tail = 0;
-static s16b temp2_x[MAX_SHORT];
-static s16b temp2_y[MAX_SHORT];
+static POSITION temp2_x[MAX_SHORT];
+static POSITION temp2_y[MAX_SHORT];
 
 /*!
  * @brief トラベル処理の記憶配列を初期化する Hack: forget the "flow" information 
@@ -4514,7 +4514,7 @@ static int travel_flow_cost(int y, int x)
  * @param wall プレイヤーが壁の中にいるならばTRUE
  * @return なし
  */
-static void travel_flow_aux(int y, int x, int n, bool wall)
+static void travel_flow_aux(POSITION y, POSITION x, int n, bool wall)
 {
        cave_type *c_ptr = &cave[y][x];
        feature_type *f_ptr = &f_info[c_ptr->feat];

diff --git a/src/cmd4.c b/src/cmd4.c
index 9ed45b6..311af56 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5449,10 +5449,11 @@ static void ang_sort_art_swap(vptr u, vptr v, int a, int b)
  */
 static void do_cmd_knowledge_artifacts(void)
 {
-       int i, k, x, y, n = 0;
+       IDX i;
+       int k, x, y, n = 0;
        IDX z;
        u16b why = 3;
-       s16b *who;
+       IDX *who;
 
        FILE *fff;
 
@@ -5617,7 +5618,8 @@ static void do_cmd_knowledge_artifacts(void)
  */
 static void do_cmd_knowledge_uniques(void)
 {
-       int i, k, n = 0;
+       IDX i;
+       int k, n = 0;
        u16b why = 2;
        IDX *who;
 
@@ -6130,9 +6132,10 @@ static void do_cmd_knowledge_pets(void)
  */
 static void do_cmd_knowledge_kill_count(void)
 {
-       int i, k, n = 0;
+       IDX i;
+       int k, n = 0;
        u16b why = 2;
-       s16b *who;
+       IDX *who;
 
        FILE *fff;
 
@@ -6731,7 +6734,7 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
        byte attr_top = 0, char_left = 0;
 
        int browser_rows;
-       POSITION wid, hgt;
+       TERM_POSITION wid, hgt;
 
        BIT_FLAGS8 mode;
 
@@ -8147,13 +8150,8 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
                                        }
                                        else
                                        {
-#ifdef JP
-                                               sprintf(rand_tmp_str,"  %s (%d 階) - %sを倒す。\n",
-                                                       quest[i].name, quest[i].level, name);
-#else
-                                               sprintf(rand_tmp_str,"  %s (Dungeon level: %d)\n  Kill %s.\n",
-                                                       quest[i].name, quest[i].level, name);
-#endif
+                                               sprintf(rand_tmp_str,_("  %s (%d 階) - %sを倒す。\n", "  %s (Dungeon level: %d)\n  Kill %s.\n"),
+                                                       quest[i].name, (int)quest[i].level, name);
                                        }
                                }
                        }
@@ -8260,13 +8258,13 @@ void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[])
  */
 void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[])
 {
-       int i;
+       IDX i;
        int total = 0;
 
        fprintf(fff, _("《失敗したクエスト》\n", "< Failed Quest >\n"));
        for (i = 1; i < max_quests; i++)
        {
-               int q_idx = quest_num[i];
+               IDX q_idx = quest_num[i];
                quest_type* const q_ptr = &quest[q_idx];
 
                if (((q_ptr->status == QUEST_STATUS_FAILED_DONE) || (q_ptr->status == QUEST_STATUS_FAILED)) &&

diff --git a/src/externs.h b/src/externs.h
index 4f65948..5a5eb66 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -148,7 +148,7 @@ extern bool character_xtra;
 extern bool creating_savefile;
 extern u32b seed_flavor;
 extern u32b seed_town;
-extern s16b command_cmd;
+extern COMMAND_CODE command_cmd;
 extern s16b command_arg;
 extern s16b command_rep;
 extern DIRECTION command_dir;

diff --git a/src/files.c b/src/files.c
index 696facd..ae25b2c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -355,7 +355,10 @@ static named_num gf_desc[] =
  */
 errr process_pref_file_command(char *buf)
 {
-       int i, j, n1, n2;
+       int i, j;
+       SYMBOL_COLOR n1;
+       SYMBOL_CODE n2;
+
 
        char *zz[16];
 

diff --git a/src/h-type.h b/src/h-type.h
index 0feaa6e..f152948 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -143,6 +143,12 @@ typedef s16b PERCENTAGE;     /*!< ゲーム中のパーセント表記の型定
 typedef u32b BIT_FLAGS;     /*!< 32ビットのフラグ配列の型定義 */
 typedef byte BIT_FLAGS8;    /*!< 8ビットのフラグ配列の型定義 */
 
+typedef s16b COMMAND_CODE;   /*!< コマンド内容の型定義 */
+
+typedef int TERM_POSITION;   /*!< コンソール表示座標の型定義 */
+typedef byte SYMBOL_COLOR;    /*!< キャラの色の型定義 */
+typedef byte SYMBOL_CODE;     /*!< キャラの文字の型定義 */
+
 /*** Pointers to all the basic types defined above ***/
 
 typedef real *real_ptr;

diff --git a/src/types.h b/src/types.h
index fe68dcb..f334c48 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -133,11 +133,11 @@ struct object_kind
        byte level;                     /*!< ベースアイテムの基本生成階 / Level */
        byte extra;                     /*!< その他色々のビットフラグ配列 / Something */
 
-       byte d_attr;            /*!< デフォルトのアイテムシンボルカラー / Default object attribute */
-       byte d_char;            /*!< デフォルトのアイテムシンボルアルファベット / Default object character */
+       SYMBOL_COLOR d_attr;            /*!< デフォルトのアイテムシンボルカラー / Default object attribute */
+       SYMBOL_CODE d_char;             /*!< デフォルトのアイテムシンボルアルファベット / Default object character */
 
-       byte x_attr;            /*!< 設定変更後のアイテムシンボルカラー /  Desired object attribute */
-       byte x_char;            /*!< 設定変更後のアイテムシンボルアルファベット /  Desired object character */
+       SYMBOL_COLOR x_attr;            /*!< 設定変更後のアイテムシンボルカラー /  Desired object attribute */
+       SYMBOL_CODE x_char;             /*!< 設定変更後のアイテムシンボルアルファベット /  Desired object character */
 
        s16b flavor;            /*!< 調査中(TODO) / Special object flavor (or zero) */
 

diff --git a/src/z-term.c b/src/z-term.c
index da4d9f8..4db323d 100644 (file)
--- a/src/z-term.c
+++ b/src/z-term.c
@@ -2320,7 +2320,7 @@ errr Term_get_cursor(int *v)
 /*
  * Extract the current window size
  */
-errr Term_get_size(int *w, int *h)
+errr Term_get_size(TERM_POSITION *w, TERM_POSITION *h)
 {
        /* Access the cursor */
        (*w) = Term->wid;

diff --git a/src/z-term.h b/src/z-term.h
index 6361ec4..991c428 100644 (file)
--- a/src/z-term.h
+++ b/src/z-term.h
@@ -37,7 +37,7 @@ struct term_win
        bool cu, cv;
        byte cx, cy;
 
-       byte **a;
+       SYMBOL_COLOR **a;
        char **c;
 
        byte *va;
@@ -187,8 +187,8 @@ struct term
        u16b key_xtra;
        u16b key_size;
 
-       byte wid;
-       byte hgt;
+       TERM_POSITION wid;
+       TERM_POSITION hgt;
 
        byte y1;
        byte y2;