X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwild.c;h=4cb5d6ecb67536328bfd5b5a6df827025cf812fc;hb=eb2f15d1cfc313fda1f0578f2685246f3b76af4d;hp=3804b8088f1c93d0d899a912987f9ab51f6634fa;hpb=3011c999c3d5a4c7761b8dd6f543cfb257f051f7;p=hengband%2Fhengband.git

diff --git a/src/wild.c b/src/wild.c
index 3804b8088..4cb5d6ecb 100644
--- 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.
@@ -154,12 +153,11 @@ static void perturb_point_end(int x1, int x2, int x3,
  * need to be converted to features.
  * </pre>
  */
-static void plasma_recursive(int x1, int y1, int x2, int y2,
-			     int depth_max, int rough)
+static void plasma_recursive(POSITION x1, POSITION y1, POSITION x2, POSITION y2, POSITION depth_max, POSITION rough)
 {
 	/* Find middle */
-	int xmid = (x2 - x1) / 2 + x1;
-	int ymid = (y2 - y1) / 2 + y1;
+	POSITION xmid = (x2 - x1) / 2 + x1;
+	POSITION ymid = (y2 - y1) / 2 + y1;
 
 	/* Are we done? */
 	if (x1 + 1 == x2) return;
@@ -205,7 +203,7 @@ static s16b terrain_table[MAX_WILDERNESS][MAX_FEAT_IN_TERRAIN];
  */
 static void generate_wilderness_area(int terrain, u32b seed, bool border, bool corner)
 {
-	int x1, y1;
+	POSITION x1, y1;
 	int table_size = sizeof(terrain_table[0]) / sizeof(s16b);
 	int roughness = 1; /* The roughness of the level. */
 	u32b state_backup[4];
@@ -315,9 +313,9 @@ static void generate_wilderness_area(int terrain, u32b seed, bool border, bool c
  * If corner is set then only the corners of the area are needed.
  * </pre>
  */
-static void generate_area(int y, int x, bool border, bool corner)
+static void generate_area(POSITION y, POSITION x, bool border, bool corner)
 {
-	int x1, y1;
+	POSITION x1, y1;
 
 	/* Number of the town (if any) */
 	p_ptr->town_num = (s16b)wilderness[y][x].town;
@@ -916,7 +914,7 @@ errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, in
  */
 void seed_wilderness(void)
 {
-	int x, y;
+	POSITION x, y;
 
 	/* Init wilderness seeds */
 	for (x = 0; x < max_wild_x; x++)
@@ -972,7 +970,7 @@ static void init_terrain_table(int terrain, s16b feat_global, cptr fmt, ...)
 	cptr    p;
 	int     cur = 0;
 	char    check = 'a';
-	s16b    feat;
+	FEAT_IDX feat;
 	int     num;
 
 	/* Begin the varargs stuff */