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

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index cc92967..64da2f7 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -1671,7 +1671,7 @@ bool activate_artifact(object_type *o_ptr)
 
        case ACT_FISHING:
        {
-               int x, y;
+               POSITION x, y;
 
                if (!get_rep_dir2(&dir)) return FALSE;
                y = p_ptr->y + ddy[dir];

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index de8bd5d..e22b0d1 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -304,7 +304,8 @@ void do_cmd_pet_dismiss(void)
 */
 bool do_riding(bool force)
 {
-       int x, y, dir = 0;
+       POSITION x, y;
+       DIRECTION dir = 0;
        cave_type *c_ptr;
        monster_type *m_ptr;
 

diff --git a/src/cmd1.c b/src/cmd1.c
index 5dd813c..8e3d8cf 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1577,9 +1577,9 @@ static bool ignore_avoid_run;
  * @param x 移動元のX座標
  * @return 移動先が既知の壁ならばTRUE
  */
-static int see_wall(int dir, int y, int x)
+static bool see_wall(DIRECTION dir, POSITION y, POSITION x)
 {
-       cave_type   *c_ptr;
+       cave_type *c_ptr;
 
        /* Get the new location */
        y += ddy[dir];
@@ -1622,7 +1622,7 @@ static int see_wall(int dir, int y, int x)
  * @param x 移動元のX座標
  * @return 移動先が未知の地形ならばTRUE
  */
-static int see_nothing(int dir, int y, int x)
+static bool see_nothing(DIRECTION dir, POSITION y, POSITION x)
 {
        /* Get the new location */
        y += ddy[dir];