| リビジョン | a2430042f51e41d46abbdc671d7c2271b71a72c8 (tree) |
|---|---|
| 日時 | 2019-02-20 00:17:46 |
| 作者 | Deskull <deskull@user...> |
| コミッター | Deskull |
[Refactor] #37353 型の置換。 / Type replacement.
src/spells1.c (diff)
src/types.h (diff) src/wild.c (diff)| @@ -5979,8 +5979,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da | ||
| 5979 | 5979 | if( is_mirror_grid(&grid_array[y][x]) && !second_step ) |
| 5980 | 5980 | { |
| 5981 | 5981 | /* The target of monsterspell becomes tha mirror(broken) */ |
| 5982 | - monster_target_y=(s16b)y; | |
| 5983 | - monster_target_x=(s16b)x; | |
| 5982 | + monster_target_y = y; | |
| 5983 | + monster_target_x = x; | |
| 5984 | 5984 | |
| 5985 | 5985 | remove_mirror(y,x); |
| 5986 | 5986 | for( j = 0; j <=i ; j++ ) |
| @@ -1020,7 +1020,7 @@ struct player_type | ||
| 1020 | 1020 | |
| 1021 | 1021 | PLAYER_LEVEL lev; /* Level */ |
| 1022 | 1022 | |
| 1023 | - s16b town_num; /* Current town number */ | |
| 1023 | + TOWN_IDX town_num; /* Current town number */ | |
| 1024 | 1024 | s16b arena_number; /* monster number in arena -KMW- */ |
| 1025 | 1025 | bool inside_arena; /* Is character inside arena? */ |
| 1026 | 1026 | QUEST_IDX inside_quest; /* Inside quest level */ |
| @@ -1647,7 +1647,7 @@ typedef struct wilderness_type wilderness_type; | ||
| 1647 | 1647 | struct wilderness_type |
| 1648 | 1648 | { |
| 1649 | 1649 | int terrain; |
| 1650 | - int town; | |
| 1650 | + TOWN_IDX town; | |
| 1651 | 1651 | int road; |
| 1652 | 1652 | u32b seed; |
| 1653 | 1653 | DEPTH level; |
| @@ -321,7 +321,7 @@ static void generate_area(POSITION y, POSITION x, bool border, bool corner) | ||
| 321 | 321 | POSITION x1, y1; |
| 322 | 322 | |
| 323 | 323 | /* Number of the town (if any) */ |
| 324 | - p_ptr->town_num = (s16b)wilderness[y][x].town; | |
| 324 | + p_ptr->town_num = wilderness[y][x].town; | |
| 325 | 325 | |
| 326 | 326 | /* Set the base level */ |
| 327 | 327 | base_level = wilderness[y][x].level; |
| @@ -747,8 +747,8 @@ typedef struct wilderness_grid wilderness_grid; | ||
| 747 | 747 | struct wilderness_grid |
| 748 | 748 | { |
| 749 | 749 | int terrain; /* Terrain type */ |
| 750 | - int town; /* Town number */ | |
| 751 | - s16b level; /* Level of the wilderness */ | |
| 750 | + TOWN_IDX town; /* Town number */ | |
| 751 | + DEPTH level; /* Level of the wilderness */ | |
| 752 | 752 | byte road; /* Road */ |
| 753 | 753 | char name[32]; /* Name of the town/wilderness */ |
| 754 | 754 | }; |
| @@ -811,7 +811,7 @@ errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, in | ||
| 811 | 811 | w_letter[index].level = 0; |
| 812 | 812 | |
| 813 | 813 | if (num > 3) |
| 814 | - w_letter[index].town = atoi(zz[3]); | |
| 814 | + w_letter[index].town = (TOWN_IDX)atoi(zz[3]); | |
| 815 | 815 | else |
| 816 | 816 | w_letter[index].town = 0; |
| 817 | 817 |
Fork