From 5ea229eed6814d429e05021678ac47326925a2be Mon Sep 17 00:00:00 2001 From: Hourier Date: Tue, 19 May 2020 23:20:23 +0900 Subject: [PATCH] [Refactor] #40392 Changed player_race_table to player_race_type --- src/birth/quick-start.h | 2 +- src/dungeon/dungeon-file.c | 4 ++-- src/io/load.c | 6 +++--- src/market/building.h | 2 +- src/player/player-effects.c | 6 +++--- src/player/player-effects.h | 2 +- src/player/player-races-table.h | 6 +++--- src/player/player-status.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/birth/quick-start.h b/src/birth/quick-start.h index b3054be4b..26a985ad6 100644 --- a/src/birth/quick-start.h +++ b/src/birth/quick-start.h @@ -5,7 +5,7 @@ */ typedef struct birther { SEX_IDX psex; /* Sex index */ - player_race_table prace; /* Race index */ + player_race_type prace; /* Race index */ player_class_type pclass; /* Class index */ player_personality_type pseikaku; /* Seikaku index */ REALM_IDX realm1; /* First magic realm */ diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c index 885837f41..95d276a87 100644 --- a/src/dungeon/dungeon-file.c +++ b/src/dungeon/dungeon-file.c @@ -2990,7 +2990,7 @@ static errr parse_line_building(char *buf) n = tokenize(s + 2, MAX_RACES, zz, 0); for (int i = 0; i < MAX_RACES; i++) { - building[index].member_race[i] = ((i < n) ? (player_race_table)atoi(zz[i]) : 1); + building[index].member_race[i] = ((i < n) ? (player_race_type)atoi(zz[i]) : 1); } break; @@ -3378,7 +3378,7 @@ static errr process_dungeon_file_aux(player_type *player_ptr, char *buf, int ymi } else if (zz[0][0] == 'R') { - max_r_idx = (player_race_table)atoi(zz[1]); + max_r_idx = (player_race_type)atoi(zz[1]); } else if (zz[0][0] == 'K') { diff --git a/src/io/load.c b/src/io/load.c index e0ca9fa0a..d41cac6d2 100644 --- a/src/io/load.c +++ b/src/io/load.c @@ -1566,7 +1566,7 @@ static void load_quick_start(void) rd_byte(&previous_char.psex); byte tmp8u; rd_byte(&tmp8u); - previous_char.prace = (player_race_table)tmp8u; + previous_char.prace = (player_race_type)tmp8u; rd_byte(&tmp8u); previous_char.pclass = (player_class_type)tmp8u; rd_byte(&tmp8u); @@ -1627,7 +1627,7 @@ static void rd_extra(player_type *creature_ptr) byte tmp8u; rd_byte(&tmp8u); - creature_ptr->prace = (player_race_table)tmp8u; + creature_ptr->prace = (player_race_type)tmp8u; rd_byte(&tmp8u); creature_ptr->pclass = (player_class_type)tmp8u; @@ -1734,7 +1734,7 @@ static void rd_extra(player_type *creature_ptr) else { rd_byte(&tmp8u); - creature_ptr->start_race = (player_race_table)tmp8u; + creature_ptr->start_race = (player_race_type)tmp8u; s32b tmp32s; rd_s32b(&tmp32s); creature_ptr->old_race1 = (BIT_FLAGS)tmp32s; diff --git a/src/market/building.h b/src/market/building.h index 31affd2ba..3558ccba7 100644 --- a/src/market/building.h +++ b/src/market/building.h @@ -38,7 +38,7 @@ struct building_type BACT_RESTRICT_IDX action_restr[8]; /* action restrictions */ player_class_type member_class[MAX_CLASS]; /* which classes are part of guild */ - player_race_table member_race[MAX_RACES]; /* which classes are part of guild */ + player_race_type member_race[MAX_RACES]; /* which classes are part of guild */ REALM_IDX member_realm[MAX_MAGIC + 1]; /* which realms are part of guild */ }; diff --git a/src/player/player-effects.c b/src/player/player-effects.c index c0d84b595..bf0a4d2ad 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -3252,7 +3252,7 @@ void do_poly_wounds(player_type *creature_ptr) /* * Change player race */ -void change_race(player_type *creature_ptr, player_race_table new_race, concptr effect_msg) +void change_race(player_type *creature_ptr, player_race_type new_race, concptr effect_msg) { concptr title = race_info[new_race].title; int old_race = creature_ptr->prace; @@ -3313,7 +3313,7 @@ void do_poly_self(player_type *creature_ptr) if ((power > randint0(20)) && one_in_(3) && (creature_ptr->prace != RACE_ANDROID)) { char effect_msg[80] = ""; - player_race_table new_race; + player_race_type new_race; power -= 10; if ((power > randint0(5)) && one_in_(4)) @@ -3371,7 +3371,7 @@ void do_poly_self(player_type *creature_ptr) do { - new_race = (player_race_table)randint0(MAX_RACES); + new_race = (player_race_type)randint0(MAX_RACES); } while ((new_race == creature_ptr->prace) || (new_race == RACE_ANDROID)); diff --git a/src/player/player-effects.h b/src/player/player-effects.h index 8f3371ea8..930ea7790 100644 --- a/src/player/player-effects.h +++ b/src/player/player-effects.h @@ -81,7 +81,7 @@ extern bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_de extern bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec); extern bool set_superstealth(player_type *creature_ptr, bool set); extern void do_poly_wounds(player_type *creature_ptr); -extern void change_race(player_type *creature_ptr, player_race_table new_race, concptr effect_msg); +extern void change_race(player_type *creature_ptr, player_race_type new_race, concptr effect_msg); extern bool drop_weapons(player_type *creature_ptr); extern const kamae kamae_shurui[MAX_KAMAE]; diff --git a/src/player/player-races-table.h b/src/player/player-races-table.h index 51906a6b0..979b47908 100644 --- a/src/player/player-races-table.h +++ b/src/player/player-races-table.h @@ -1,9 +1,9 @@ #pragma once /*! - * @details 既にplayer_raceが存在するので_tableと付けた + * @details 既にplayer_raceが存在するので_typeと付けた */ -typedef enum player_race_table { +typedef enum player_race_type { RACE_HUMAN = 0, RACE_HALF_ELF = 1, RACE_ELF = 2, @@ -42,4 +42,4 @@ typedef enum player_race_table { RACE_KUTAR = 35, RACE_ANDROID = 36, RACE_MERFOLK = 37, -} player_race_table; +} player_race_type; diff --git a/src/player/player-status.h b/src/player/player-status.h index 4192441b6..09a82c567 100644 --- a/src/player/player-status.h +++ b/src/player/player-status.h @@ -98,7 +98,7 @@ typedef struct player_type POSITION oldpx; /* Previous player location -KMW- */ SEX_IDX psex; /* Sex index */ - player_race_table prace; /* Race index */ + player_race_type prace; /* Race index */ player_class_type pclass; /* Class index */ player_personality_type pseikaku; /* Seikaku index */ REALM_IDX realm1; /* First magic realm */ @@ -440,7 +440,7 @@ typedef struct player_type BIT_FLAGS8 knowledge; /* Knowledge about yourself */ BIT_FLAGS visit; /* Visited towns */ - player_race_table start_race; /* Race at birth */ + player_race_type start_race; /* Race at birth */ BIT_FLAGS old_race1; /* Record of race changes */ BIT_FLAGS old_race2; /* Record of race changes */ s16b old_realm; /* Record of realm changes */ -- 2.11.0