| リビジョン | d93fe8626b3b51507ea1ee09c49e5d501b1c500d (tree) |
|---|---|
| 日時 | 2017-06-25 23:18:23 |
| 作者 | Deskull <desull@user...> |
| コミッター | Deskull |
#37287 rooms.c内のC4457警告に対応。ソースコード整形。 / Deal C4457 warning in rooms.c. Source code formatting.
src/generate.h (diff)
src/rooms.c (diff)| @@ -35,7 +35,6 @@ | ||
| 35 | 35 | #define DUN_TUN_JCT_MIN 60 /* Chance of doors at tunnel junctions (was 90) */ |
| 36 | 36 | #define DUN_TUN_JCT_MAX 90 |
| 37 | 37 | |
| 38 | -extern int dun_rooms; | |
| 39 | 38 | |
| 40 | 39 | extern int dun_tun_rnd; /*!< ダンジョンの通路方向を掻き回す頻度(一回の試行ごとに%で判定している) */ |
| 41 | 40 | extern int dun_tun_chg; /*!< ダンジョンの通路をクランクさせる頻度(一回の試行ごとに%で判定している) */ |
| @@ -4379,23 +4379,23 @@ static void build_bubble_vault(int x0, int y0, int xsize, int ysize) | ||
| 4379 | 4379 | /* Top and bottom boundaries */ |
| 4380 | 4380 | for (i = 0; i < xsize; i++) |
| 4381 | 4381 | { |
| 4382 | - int x = x0 - xhsize + i; | |
| 4382 | + int side_x = x0 - xhsize + i; | |
| 4383 | 4383 | |
| 4384 | - place_outer_noperm_bold(y0 - yhsize + 0, x); | |
| 4385 | - cave[y0 - yhsize + 0][x].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4386 | - place_outer_noperm_bold(y0 - yhsize + ysize - 1, x); | |
| 4387 | - cave[y0 - yhsize + ysize - 1][x].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4384 | + place_outer_noperm_bold(y0 - yhsize + 0, side_x); | |
| 4385 | + cave[y0 - yhsize + 0][side_x].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4386 | + place_outer_noperm_bold(y0 - yhsize + ysize - 1, side_x); | |
| 4387 | + cave[y0 - yhsize + ysize - 1][side_x].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4388 | 4388 | } |
| 4389 | 4389 | |
| 4390 | 4390 | /* Left and right boundaries */ |
| 4391 | 4391 | for (i = 1; i < ysize - 1; i++) |
| 4392 | 4392 | { |
| 4393 | - int y = y0 - yhsize + i; | |
| 4393 | + int side_y = y0 - yhsize + i; | |
| 4394 | 4394 | |
| 4395 | - place_outer_noperm_bold(y, x0 - xhsize + 0); | |
| 4396 | - cave[y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4397 | - place_outer_noperm_bold(y, x0 - xhsize + xsize - 1); | |
| 4398 | - cave[y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4395 | + place_outer_noperm_bold(side_y, x0 - xhsize + 0); | |
| 4396 | + cave[side_y][x0 - xhsize + 0].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4397 | + place_outer_noperm_bold(side_y, x0 - xhsize + xsize - 1); | |
| 4398 | + cave[side_y][x0 - xhsize + xsize - 1].info |= (CAVE_ROOM | CAVE_ICKY); | |
| 4399 | 4399 | } |
| 4400 | 4400 | |
| 4401 | 4401 | /* Fill in middle with bubbles */ |
Fork