From 56cbbf1722ac3aacfa709a02743cbb4121887772 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 29 Dec 2018 14:12:31 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?= =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/rooms.c | 37 ++++++++++++++++--------------------- src/wizard2.c | 2 +- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/rooms.c b/src/rooms.c index b762b6fb1..97e7ad34a 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -92,7 +92,7 @@ static room_info_type room_info_normal[ROOM_T_MAX] = {{ 0, 0, 1, 1, 1, 2, 3, 4, 5, 6, 8}, 20}, /*TRAP */ {{ 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2}, 40}, /*GLASS */ {{ 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3}, 1}, /*ARCADE */ - {{ 20, 40, 60, 80,100,100,100,100,100,100,100}, 1}, /*FIX */ + {{ 20, 40, 60, 80,100,100,100,100,100,100,100}, 1}, /*FIX */ }; #endif @@ -117,7 +117,7 @@ static room_info_type room_info_normal[ROOM_T_MAX] = { { 0, 0, 1, 1, 1, 2, 3, 4, 5, 6, 0}, 20 }, /*TRAP */ { { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 0}, 40 }, /*GLASS */ { { 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 0}, 1 }, /*ARCADE */ -{ { 20, 40, 60, 80,100,100,100,100,100,100,100}, 1 }, /*FIX */ +{ { 20, 40, 60, 80,100,100,100,100,100,100,100}, 1 }, /*FIX */ }; #endif @@ -282,9 +282,9 @@ static void check_room_boundary(POSITION x1, POSITION y1, POSITION x2, POSITION * @param block_x 範囲の左端 * @return なし */ -static bool find_space_aux(int blocks_high, int blocks_wide, int block_y, int block_x) +static bool find_space_aux(POSITION blocks_high, POSITION blocks_wide, POSITION block_y, POSITION block_x) { - int by1, bx1, by2, bx2, by, bx; + POSITION by1, bx1, by2, bx2, by, bx; /* Itty-bitty rooms must shift about within their rectangle */ if (blocks_wide < 3) @@ -327,8 +327,8 @@ static bool find_space_aux(int blocks_high, int blocks_wide, int block_y, int bl } /* Extract blocks */ - by1 = block_y + 0; - bx1 = block_x + 0; + by1 = block_y; + bx1 = block_x; by2 = block_y + blocks_high; bx2 = block_x + blocks_wide; @@ -376,13 +376,12 @@ static bool find_space_aux(int blocks_high, int blocks_wide, int block_y, int bl bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width) { int candidates, pick; - int by, bx, by1, bx1, by2, bx2; - int block_y = 0, block_x = 0; - + POSITION by, bx, by1, bx1, by2, bx2; + POSITION block_y = 0, block_x = 0; /* Find out how many blocks we need. */ - int blocks_high = 1 + ((height - 1) / BLOCK_HGT); - int blocks_wide = 1 + ((width - 1) / BLOCK_WID); + POSITION blocks_high = 1 + ((height - 1) / BLOCK_HGT); + POSITION blocks_wide = 1 + ((width - 1) / BLOCK_WID); /* There are no way to allocate such huge space */ if (dun->row_rooms < blocks_high) return FALSE; @@ -442,8 +441,8 @@ bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width) } /* Extract blocks */ - by1 = block_y + 0; - bx1 = block_x + 0; + by1 = block_y; + bx1 = block_x; by2 = block_y + blocks_high; bx2 = block_x + blocks_wide; @@ -473,7 +472,6 @@ bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width) } } - /* * Hack- See if room will cut off a cavern. * @@ -482,14 +480,11 @@ bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width) */ check_room_boundary(*x - width / 2 - 1, *y - height / 2 - 1, *x + (width - 1) / 2 + 1, *y + (height - 1) / 2 + 1); - /* Success. */ return TRUE; } - - /* * Structure to hold all "fill" data */ @@ -527,15 +522,15 @@ static fill_data_type fill_data; /* Store routine for the fractal cave generator */ /* this routine probably should be an inline function or a macro. */ -static void store_height(POSITION x, POSITION y, int val) +static void store_height(POSITION x, POSITION y, FEAT_IDX val) { /* if on boundary set val > cutoff so walls are not as square */ if (((x == fill_data.xmin) || (y == fill_data.ymin) || - (x == fill_data.xmax) || (y == fill_data.ymax)) && - (val <= fill_data.c1)) val = fill_data.c1 + 1; + (x == fill_data.xmax) || (y == fill_data.ymax)) && + (val <= fill_data.c1)) val = fill_data.c1 + 1; /* store the value in height-map format */ - cave[y][x].feat = (s16b)val; + cave[y][x].feat = val; return; } diff --git a/src/wizard2.c b/src/wizard2.c index 632695894..2f459c871 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -2121,7 +2121,7 @@ void do_cmd_debug(void) /* For temporary test. */ case 'X': { - int i; + INVENTORY_IDX i; for(i = INVEN_TOTAL - 1; i >= 0; i--) { if(inventory[i].k_idx) inven_drop(i, 999); -- 2.11.0