#37287 #37353 (2.2.0.89) DEPTHをs32bに再定義、型の置換を継続中。 / Redefine DEPTH to s32b, ongoing...

diff --git a/src/artifact.c b/src/artifact.c
index bf028d5..5224ce9 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2556,8 +2556,8 @@ bool activate_random_artifact(object_type *o_ptr)
 
                case ACT_CAST_BA_STAR:
                {
-                       int num = damroll(5, 3);
-                       int y = 0, x = 0;
+                       HIT_POINT num = damroll(5, 3);
+                       POSITION y = 0, x = 0;
                        int attempts;
                        msg_format(_("%sが稲妻で覆われた...","The %s is surrounded by lightning..."), name);
                        for (k = 0; k < num; k++)
@@ -3849,7 +3849,7 @@ bool create_named_art(int a_idx, int y, int x)
 {
        object_type forge;
        object_type *q_ptr;
-       int i;
+       IDX i;
 
        artifact_type *a_ptr = &a_info[a_idx];
 

diff --git a/src/externs.h b/src/externs.h
index 2cfb603..1be7a00 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -159,13 +159,13 @@ extern s16b command_new;
 extern bool msg_flag;
 extern s16b running;
 extern s16b resting;
-extern s16b cur_hgt;
-extern s16b cur_wid;
-extern s16b dun_level;
+extern POSITION cur_hgt;
+extern POSITION cur_wid;
+extern DEPTH dun_level;
 extern s16b num_repro;
-extern s16b object_level;
-extern s16b monster_level;
-extern s16b base_level;
+extern DEPTH object_level;
+extern DEPTH monster_level;
+extern DEPTH base_level;
 extern s32b turn;
 extern s32b turn_limit;
 extern s32b dungeon_turn;

diff --git a/src/h-type.h b/src/h-type.h
index e0e4c2f..63355d5 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -132,7 +132,7 @@ typedef s32b PRICE;      /*!< ゲーム中の金額価値の型定義 */
 
 typedef u32b STR_OFFSET;      /*!< テキストオフセットの型定義 */
 
-typedef byte DEPTH;     /*!< ゲーム中の階層レベルの型定義 */
+typedef s32b DEPTH;     /*!< ゲーム中の階層レベルの型定義 */
 typedef byte RARITY;    /*!< ゲーム中の希少度の型定義 */
 
 

diff --git a/src/load.c b/src/load.c
index 373fdcd..33a9ec0 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -2491,14 +2491,16 @@ static errr rd_dungeon_old(void)
        /*** Basic info ***/
 
        /* Header info */
-       rd_s16b(&dun_level);
+       rd_s16b(&tmp16s);
+       dun_level = (DEPTH)tmp16s;
        if (z_older_than(10, 3, 8)) dungeon_type = DUNGEON_ANGBAND;
        else rd_byte(&dungeon_type);
 
        /* Set the base level for old versions */
        base_level = dun_level;
 
-       rd_s16b(&base_level);
+       rd_s16b(&tmp16s);
+       base_level = (DEPTH)tmp16s;
 
        rd_s16b(&num_repro);
        rd_s16b(&tmp16s);
@@ -2506,8 +2508,10 @@ static errr rd_dungeon_old(void)
        rd_s16b(&tmp16s);
        p_ptr->x = (int)tmp16s;
        if (z_older_than(10, 3, 13) && !dun_level && !p_ptr->inside_arena) {p_ptr->y = 33;p_ptr->x = 131;}
-       rd_s16b(&cur_hgt);
-       rd_s16b(&cur_wid);
+       rd_s16b(&tmp16s);
+       cur_hgt = (POSITION)tmp16s;
+       rd_s16b(&tmp16s);
+       cur_wid = (POSITION)tmp16s;
        rd_s16b(&tmp16s); /* max_panel_rows */
        rd_s16b(&tmp16s); /* max_panel_cols */
 
@@ -2918,7 +2922,8 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr)
        {
                /*** Not a saved floor ***/
 
-               rd_s16b(&dun_level);
+               rd_s16b(&tmp16s);
+               dun_level = (DEPTH)tmp16s;
                base_level = dun_level;
        }
        else
@@ -2948,7 +2953,8 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr)
                if (tmp16s != sf_ptr->lower_floor_id) return 171;
        }
 
-       rd_s16b(&base_level);
+       rd_s16b(&tmp16s);
+       base_level = (DEPTH)tmp16s;
        rd_s16b(&num_repro);
 
        rd_u16b(&tmp16u);
@@ -2957,8 +2963,10 @@ static errr rd_saved_floor(saved_floor_type *sf_ptr)
        rd_u16b(&tmp16u);
        p_ptr->x = (int)tmp16u;
 
-       rd_s16b(&cur_hgt);
-       rd_s16b(&cur_wid);
+       rd_s16b(&tmp16s);
+       cur_hgt = (POSITION)tmp16s;
+       rd_s16b(&tmp16s);
+       cur_wid = (POSITION)tmp16s;
 
        rd_byte(&p_ptr->feeling);
 

diff --git a/src/main-win.c b/src/main-win.c
index 784ce7e..6f17a28 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -761,7 +761,7 @@ static byte special_key_list[] =
 \r
 /* Function prototype */\r
 \r
-static bool is_already_running();\r
+static bool is_already_running(void);\r
 \r
 \r
 /* bg */\r

diff --git a/src/melee2.c b/src/melee2.c
index 0561bb6..2876d87 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -2103,7 +2103,7 @@ static bool check_hp_for_feat_destruction(feature_type *f_ptr, monster_type *m_p
  *\n
  * A "direction" of "5" means "pick a random direction".\n
  */
-static void process_monster(int m_idx)
+static void process_monster(IDX m_idx)
 {
        monster_type    *m_ptr = &m_list[m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];

diff --git a/src/save.c b/src/save.c
index 528b97d..59debc6 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -933,7 +933,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
        {
                /*** Not a saved floor ***/
 
-               wr_s16b(dun_level);
+               wr_s16b((s16b)dun_level);
        }
        else
        {
@@ -948,12 +948,12 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
                wr_s16b(sf_ptr->lower_floor_id);
        }
 
-       wr_u16b(base_level);
+       wr_u16b((u16b)base_level);
        wr_u16b(num_repro);
        wr_u16b((u16b)p_ptr->y);
        wr_u16b((u16b)p_ptr->x);
-       wr_u16b(cur_hgt);
-       wr_u16b(cur_wid);
+       wr_u16b((u16b)cur_hgt);
+       wr_u16b((u16b)cur_wid);
        wr_byte(p_ptr->feeling);
 
 

diff --git a/src/variable.c b/src/variable.c
index b8512ca..9c40f1f 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -112,13 +112,13 @@ bool msg_flag;                    /* Used in msg_print() for "buffering" */
 s16b running;                  /* Current counter for running, if any */
 s16b resting;                  /* Current counter for resting, if any */
 
-s16b cur_hgt;                  /* Current dungeon height */
-s16b cur_wid;                  /* Current dungeon width */
-s16b dun_level;                        /* Current dungeon level */
+POSITION cur_hgt;              /* Current dungeon height */
+POSITION cur_wid;              /* Current dungeon width */
+DEPTH dun_level;               /* Current dungeon level */
 s16b num_repro;                        /* Current reproducer count */
-s16b object_level;             /* Current object creation level */
-s16b monster_level;            /* Current monster creation level */
-s16b base_level;        /* Base dungeon level */
+DEPTH object_level;            /* Current object creation level */
+DEPTH monster_level;   /* Current monster creation level */
+DEPTH base_level;              /* Base dungeon level */
 
 s32b turn;                             /*!< 画面表示上のゲーム時間基準となるターン / Current game turn */
 s32b turn_limit;               /*!< turnの最大値 / Limit of game turn */