[Refactor] #37353 型の置換 / Type replacement.

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

diff --git a/src/wild.c b/src/wild.c
index 946b286..4ada1cc 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -11,6 +11,8 @@
  */
 
 #include "angband.h"
+#include "world.h"
+#include "monster.h"
 
 /*!
  * @brief 地形生成確率を決める要素100の配列を確率テーブルから作成する
@@ -74,16 +76,16 @@ void set_floor_and_wall(DUNGEON_IDX type)
  * @param depth_max 深みの最大値
  * @return なし
  */
-static void perturb_point_mid(POSITION x1, POSITION x2, POSITION x3, POSITION x4, POSITION xmid, POSITION ymid, POSITION rough, POSITION depth_max)
+static void perturb_point_mid(FEAT_IDX x1, FEAT_IDX x2, FEAT_IDX x3, FEAT_IDX x4, POSITION xmid, POSITION ymid, FEAT_IDX rough, FEAT_IDX depth_max)
 {
        /*
         * Average the four corners & perturb it a bit.
         * tmp is a random int +/- rough
         */
-       int tmp2 = rough*2 + 1;
-       int tmp = randint1(tmp2) - (rough + 1);
+       FEAT_IDX tmp2 = rough*2 + 1;
+       FEAT_IDX tmp = randint1(tmp2) - (rough + 1);
 
-       int avg = ((x1 + x2 + x3 + x4) / 4) + tmp;
+       FEAT_IDX avg = ((x1 + x2 + x3 + x4) / 4) + tmp;
 
        /* Division always rounds down, so we round up again */
        if (((x1 + x2 + x3 + x4) % 4) > 1)
@@ -94,7 +96,7 @@ static void perturb_point_mid(POSITION x1, POSITION x2, POSITION x3, POSITION x4
        if (avg > depth_max) avg = depth_max;
 
        /* Set the new value. */
-       cave[ymid][xmid].feat = (s16b)avg;
+       cave[ymid][xmid].feat = (FEAT_IDX)avg;
 }
 
 
@@ -110,17 +112,16 @@ static void perturb_point_mid(POSITION x1, POSITION x2, POSITION x3, POSITION x4
  * @param depth_max 深みの最大値
  * @return なし
  */
-static void perturb_point_end(int x1, int x2, int x3,
-                         int xmid, int ymid, int rough, int depth_max)
+static void perturb_point_end(FEAT_IDX x1, FEAT_IDX x2, FEAT_IDX x3, POSITION xmid, POSITION ymid, FEAT_IDX rough, FEAT_IDX depth_max)
 {
        /*
         * Average the three corners & perturb it a bit.
         * tmp is a random int +/- rough
         */
-       int tmp2 = rough * 2 + 1;
-       int tmp = randint0(tmp2) - rough;
+       FEAT_IDX tmp2 = rough * 2 + 1;
+       FEAT_IDX tmp = randint0(tmp2) - rough;
 
-       int avg = ((x1 + x2 + x3) / 3) + tmp;
+       FEAT_IDX avg = ((x1 + x2 + x3) / 3) + tmp;
 
        /* Division always rounds down, so we round up again */
        if ((x1 + x2 + x3) % 3) avg++;
@@ -130,7 +131,7 @@ static void perturb_point_end(int x1, int x2, int x3,
        if (avg > depth_max) avg = depth_max;
 
        /* Set the new value. */
-       cave[ymid][xmid].feat = (s16b)avg;
+       cave[ymid][xmid].feat = (FEAT_IDX)avg;
 }
 
 
@@ -463,8 +464,6 @@ void wilderness_gen(void)
 
        x = p_ptr->wilderness_x;
        y = p_ptr->wilderness_y;
-
-       /* Prepare allocation table */
        get_mon_num_prep(get_monster_hook(), NULL);
 
        /* North border */
@@ -964,13 +963,13 @@ errr init_wilderness(void)
  * @param fmt 地勢内の地形数を参照するための独自フォーマット
  * @return なし
  */
-static void init_terrain_table(int terrain, s16b feat_global, cptr fmt, ...)
+static void init_terrain_table(int terrain, s16b feat_global, concptr fmt, ...)
 {
        va_list vp;
-       cptr    p;
+       concptr    p;
        int     cur = 0;
        char    check = 'a';
-       s16b    feat;
+       FEAT_IDX feat;
        int     num;
 
        /* Begin the varargs stuff */
@@ -1157,9 +1156,9 @@ bool change_wild_mode(void)
        if (have_pet)
        {
 #ifdef JP
-               cptr msg = "ペットを置いて広域マップに入りますか？";
+               concptr msg = "ペットを置いて広域マップに入りますか？";
 #else
-               cptr msg = "Do you leave your pets behind? ";
+               concptr msg = "Do you leave your pets behind? ";
 #endif
 
                if (!get_check_strict(msg, CHECK_OKAY_CANCEL))