| リビジョン | b8d0a56379f47fc026f6b9c8d5ce34d4fc60ea77 (tree) |
|---|---|
| 日時 | 2018-11-19 22:45:50 |
| 作者 | Deskull <deskull@user...> |
| コミッター | Deskull |
[Refactor] #37353 型の置換。 / Type replacement.
src/cave.c (diff) src/cmd1.c (diff)
src/externs.h (diff) src/wild.c (diff)| @@ -4298,9 +4298,9 @@ void map_area(POSITION range) | ||
| 4298 | 4298 | { |
| 4299 | 4299 | int i; |
| 4300 | 4300 | POSITION x, y; |
| 4301 | - cave_type *c_ptr; | |
| 4302 | - s16b feat; | |
| 4303 | - feature_type *f_ptr; | |
| 4301 | + cave_type *c_ptr; | |
| 4302 | + FEAT_IDX feat; | |
| 4303 | + feature_type *f_ptr; | |
| 4304 | 4304 | |
| 4305 | 4305 | if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3; |
| 4306 | 4306 |
| @@ -4377,7 +4377,8 @@ void map_area(POSITION range) | ||
| 4377 | 4377 | */ |
| 4378 | 4378 | void wiz_lite(bool ninja) |
| 4379 | 4379 | { |
| 4380 | - int i, y, x; | |
| 4380 | + OBJECT_IDX i; | |
| 4381 | + POSITION y, x; | |
| 4381 | 4382 | FEAT_IDX feat; |
| 4382 | 4383 | feature_type *f_ptr; |
| 4383 | 4384 |
| @@ -4475,8 +4476,8 @@ void wiz_lite(bool ninja) | ||
| 4475 | 4476 | */ |
| 4476 | 4477 | void wiz_dark(void) |
| 4477 | 4478 | { |
| 4478 | - int i, y, x; | |
| 4479 | - | |
| 4479 | + OBJECT_IDX i; | |
| 4480 | + POSITION y, x; | |
| 4480 | 4481 | |
| 4481 | 4482 | /* Forget every grid */ |
| 4482 | 4483 | for (y = 1; y < cur_hgt - 1; y++) |
| @@ -4539,10 +4540,6 @@ void wiz_dark(void) | ||
| 4539 | 4540 | p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); |
| 4540 | 4541 | } |
| 4541 | 4542 | |
| 4542 | - | |
| 4543 | - | |
| 4544 | - | |
| 4545 | - | |
| 4546 | 4543 | /* |
| 4547 | 4544 | * Change the "feat" flag for a grid, and notice/redraw the grid |
| 4548 | 4545 | */ |
| @@ -4563,7 +4560,8 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat) | ||
| 4563 | 4560 | /* Hack -- glow the GLOW terrain */ |
| 4564 | 4561 | if (have_flag(f_ptr->flags, FF_GLOW) && !(d_info[dungeon_type].flags1 & DF1_DARKNESS)) |
| 4565 | 4562 | { |
| 4566 | - int i, yy, xx; | |
| 4563 | + DIRECTION i; | |
| 4564 | + POSITION yy, xx; | |
| 4567 | 4565 | |
| 4568 | 4566 | for (i = 0; i < 9; i++) |
| 4569 | 4567 | { |
| @@ -4626,7 +4624,8 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat) | ||
| 4626 | 4624 | /* Hack -- glow the GLOW terrain */ |
| 4627 | 4625 | if (have_flag(f_ptr->flags, FF_GLOW) && !(d_info[dungeon_type].flags1 & DF1_DARKNESS)) |
| 4628 | 4626 | { |
| 4629 | - int i, yy, xx; | |
| 4627 | + DIRECTION i; | |
| 4628 | + POSITION yy, xx; | |
| 4630 | 4629 | cave_type *cc_ptr; |
| 4631 | 4630 | |
| 4632 | 4631 | for (i = 0; i < 9; i++) |
| @@ -4660,7 +4659,7 @@ void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat) | ||
| 4660 | 4659 | } |
| 4661 | 4660 | |
| 4662 | 4661 | |
| 4663 | -IDX conv_dungeon_feat(IDX newfeat) | |
| 4662 | +FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat) | |
| 4664 | 4663 | { |
| 4665 | 4664 | feature_type *f_ptr = &f_info[newfeat]; |
| 4666 | 4665 |
| @@ -4694,7 +4693,7 @@ IDX conv_dungeon_feat(IDX newfeat) | ||
| 4694 | 4693 | * Take a feature, determine what that feature becomes |
| 4695 | 4694 | * through applying the given action. |
| 4696 | 4695 | */ |
| 4697 | -IDX feat_state(IDX feat, int action) | |
| 4696 | +FEAT_IDX feat_state(FEAT_IDX feat, int action) | |
| 4698 | 4697 | { |
| 4699 | 4698 | feature_type *f_ptr = &f_info[feat]; |
| 4700 | 4699 | int i; |
| @@ -1798,7 +1798,7 @@ static bool run_test(void) | ||
| 1798 | 1798 | int i, max, inv; |
| 1799 | 1799 | int option = 0, option2 = 0; |
| 1800 | 1800 | cave_type *c_ptr; |
| 1801 | - s16b feat; | |
| 1801 | + FEAT_IDX feat; | |
| 1802 | 1802 | feature_type *f_ptr; |
| 1803 | 1803 | |
| 1804 | 1804 | /* Where we came from */ |
| @@ -504,8 +504,8 @@ extern void map_area(POSITION range); | ||
| 504 | 504 | extern void wiz_lite(bool ninja); |
| 505 | 505 | extern void wiz_dark(void); |
| 506 | 506 | extern void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat); |
| 507 | -extern IDX conv_dungeon_feat(IDX newfeat); | |
| 508 | -extern IDX feat_state(IDX feat, int action); | |
| 507 | +extern FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat); | |
| 508 | +extern FEAT_IDX feat_state(IDX feat, int action); | |
| 509 | 509 | extern void cave_alter_feat(POSITION y, POSITION x, int action); |
| 510 | 510 | extern void remove_mirror(POSITION y, POSITION x); |
| 511 | 511 | extern bool is_mirror_grid(cave_type *c_ptr); |
| @@ -970,7 +970,7 @@ static void init_terrain_table(int terrain, s16b feat_global, cptr fmt, ...) | ||
| 970 | 970 | cptr p; |
| 971 | 971 | int cur = 0; |
| 972 | 972 | char check = 'a'; |
| 973 | - s16b feat; | |
| 973 | + FEAT_IDX feat; | |
| 974 | 974 | int num; |
| 975 | 975 | |
| 976 | 976 | /* Begin the varargs stuff */ |
Fork