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

diff --git a/src/grid.c b/src/grid.c
index 7ae52e2..57a79c8 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -532,7 +532,7 @@ void place_floor(POSITION x1, POSITION x2, POSITION y1, POSITION y2, bool light)
  */
 void place_room(POSITION x1, POSITION x2, POSITION y1, POSITION y2, bool light)
 {
-       int y, x;
+       POSITION y, x;
 
        place_floor(x1, x2, y1, y2, light);
 

diff --git a/src/hissatsu.c b/src/hissatsu.c
index 61bf62a..976f2d8 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -37,8 +37,8 @@ static int get_hissatsu_power(SPELL_IDX *sn)
        SPELL_IDX i;
        int j = 0;
        int num = 0;
-       int y = 1;
-       int x = 15;
+       POSITION y = 1;
+       POSITION x = 15;
        PLAYER_LEVEL plev = p_ptr->lev;
        int ask = TRUE;
        char choice;

diff --git a/src/load.c b/src/load.c
index 03a94b0..460dc54 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -146,7 +146,7 @@ static bool z_older_than(byte x, byte y, byte z)
  */
 static void note(cptr msg)
 {
-       static int y = 2;
+       static TERM_LEN y = 2;
 
        /* Draw the message */
        prt(msg, y, 0);

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index bd915d9..b82b83b 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -1088,11 +1088,11 @@ static void build_mini_c_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
 *\r
 *This makes a vault that looks like a castle/ city in the dungeon.\r
 */\r
-static void build_castle_vault(int x0, int y0, int xsize, int ysize)\r
+static void build_castle_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION ysize)\r
 {\r
-       int dy, dx;\r
-       int y1, x1, y2, x2;\r
-       int y, x;\r
+       POSITION dy, dx;\r
+       POSITION y1, x1, y2, x2;\r
+       POSITION y, x;\r
 \r
        /* Pick a random room size */\r
        dy = ysize / 2 - 1;\r

diff --git a/src/spells2.c b/src/spells2.c
index 6dd8ead..fbc047d 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4070,7 +4070,7 @@ bool kawarimi(bool success)
 {
        object_type forge;
        object_type *q_ptr = &forge;
-       int y, x;
+       POSITION y, x;
 
        if (p_ptr->is_dead) return FALSE;
        if (p_ptr->confused || p_ptr->blind || p_ptr->paralyzed || p_ptr->image) return FALSE;

diff --git a/src/xtra2.c b/src/xtra2.c
index 0dad02e..5b8b4fe 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2822,8 +2822,8 @@ static bool target_set_accept(POSITION y, POSITION x)
  */
 static void target_set_prepare(BIT_FLAGS mode)
 {
-       int y, x;
-       int min_hgt, max_hgt, min_wid, max_wid;
+       POSITION y, x;
+       POSITION min_hgt, max_hgt, min_wid, max_wid;
 
        if (mode & TARGET_KILL)
        {