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

diff --git a/src/externs.h b/src/externs.h
index ee5355a..25f0a8c 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -923,7 +923,7 @@ extern bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
 extern bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx);
 extern bool earthquake(POSITION cy, POSITION cx, POSITION r);
 extern void lite_room(POSITION y1, POSITION x1);
-extern void unlite_room(int y1, int x1);
+extern void unlite_room(POSITION y1, POSITION x1);
 extern bool lite_area(HIT_POINT dam, int rad);
 extern bool unlite_area(HIT_POINT dam, int rad);
 extern bool fire_ball(int typ, int dir, HIT_POINT dam, int rad);

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index 2827765..e32f53e 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -873,12 +873,13 @@ static void build_target_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
 *\r
 * Miniture rooms are then scattered across the vault.\r
 */\r
-static void build_elemental_vault(int x0, int y0, int xsiz, int ysiz)\r
+static void build_elemental_vault(POSITION x0, POSITION y0, POSITION xsiz, POSITION ysiz)\r
 {\r
        int grd, roug;\r
        int c1, c2, c3;\r
        bool done = FALSE;\r
-       int xsize, ysize, xhsize, yhsize, x, y, i;\r
+       POSITION xsize, ysize, xhsize, yhsize, x, y;\r
+       int i;\r
        int type;\r
 \r
        msg_print_wizard(CHEAT_DUNGEON, _("精霊界ランダムVaultを生成しました。", "Elemental Vault"));\r
@@ -965,10 +966,10 @@ static void build_elemental_vault(int x0, int y0, int xsiz, int ysiz)
 * The vault has two entrances on opposite sides to guarantee\r
 * a way to get in even if the vault abuts a side of the dungeon.\r
 */\r
-static void build_mini_c_vault(int x0, int y0, int xsize, int ysize)\r
+static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION ysize)\r
 {\r
-       int dy, dx;\r
-       int y1, x1, y2, x2, y, x, total;\r
+       POSITION dy, dx;\r
+       POSITION y1, x1, y2, x2, y, x, total;\r
        int m, n, num_vertices;\r
        int *visited;\r
 \r

diff --git a/src/spells2.c b/src/spells2.c
index 116bb99..90d5257 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2756,9 +2756,10 @@ void lite_room(POSITION y1, POSITION x1)
  * @param x1 指定X座標
  * @return なし
  */
-void unlite_room(int y1, int x1)
+void unlite_room(POSITION y1, POSITION x1)
 {
-       int i, x, y;
+       int i;
+       POSITION x, y;
 
        /* Add the initial grid */
        cave_temp_unlite_room_aux(y1, x1);

diff --git a/src/trap.c b/src/trap.c
index e3f1916..48ae632 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -502,7 +502,7 @@ void hit_trap(bool break_trap)
                static int levs[10] = { 0, 0, 20, 10, 5, 3, 2, 1, 1, 1 };\r
                int evil_idx = 0, good_idx = 0;\r
 \r
-               int lev;\r
+               DEPTH lev;\r
                msg_print(_("突然天界の戦争に巻き込まれた！", "Suddenly, you are surrounded by immotal beings!"));\r
 \r
                /* Summon Demons and Angels */\r
@@ -511,8 +511,8 @@ void hit_trap(bool break_trap)
                        num = levs[MIN(lev / 10, 9)];\r
                        for (i = 0; i < num; i++)\r
                        {\r
-                               int x1 = rand_spread(x, 7);\r
-                               int y1 = rand_spread(y, 5);\r
+                               POSITION x1 = rand_spread(x, 7);\r
+                               POSITION y1 = rand_spread(y, 5);\r
 \r
                                /* Skip illegal grids */\r
                                if (!in_bounds(y1, x1)) continue;\r

diff --git a/src/wild.c b/src/wild.c
index 198f3de..946b286 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -74,8 +74,7 @@ void set_floor_and_wall(DUNGEON_IDX type)
  * @param depth_max 深みの最大値
  * @return なし
  */
-static void perturb_point_mid(int x1, int x2, int x3, int x4,
-                         int xmid, int ymid, int rough, int depth_max)
+static void perturb_point_mid(POSITION x1, POSITION x2, POSITION x3, POSITION x4, POSITION xmid, POSITION ymid, POSITION rough, POSITION depth_max)
 {
        /*
         * Average the four corners & perturb it a bit.