From fa70aed2fbba8f537e1c669d6e5ee0dffee3f28f Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 13 Jun 2020 19:45:40 +0900 Subject: [PATCH] [Refactor] #40413 Incorporated MAX_RACES into player-race-types.h --- Hengband/Hengband/Hengband.vcxproj | 2 +- Hengband/Hengband/Hengband.vcxproj.filters | 6 +++--- src/Makefile.am | 2 +- src/autopick/autopick-destroyer.c | 2 +- src/birth/birth-body-spec.c | 2 +- src/birth/birth-stat.c | 2 +- src/birth/character-builder.c | 2 +- src/birth/game-play-initializer.c | 2 +- src/birth/history-generator.c | 2 +- src/birth/inventory-initializer.c | 2 +- src/cmd-building/cmd-inn.c | 2 +- src/cmd-item/cmd-activate.c | 2 +- src/cmd-item/cmd-eat.c | 2 +- src/cmd-item/cmd-item.c | 2 +- src/cmd-item/cmd-quaff.c | 2 +- src/cmd-item/cmd-usestaff.c | 2 +- src/cmd/cmd-draw.c | 2 +- src/core/game-play.c | 2 +- src/core/hp-mp-processor.c | 2 +- src/core/turn-compensator.c | 2 +- src/effect/effect-player-resist-hurt.c | 2 +- src/effect/effect-player-switcher.c | 2 +- src/floor/pattern-walk.c | 2 +- src/inventory/inventory-curse.c | 2 +- src/io/load.c | 2 +- src/io/targeting.c | 2 +- src/melee/melee-postprocess.c | 2 +- src/mind/racial.c | 2 +- src/mspell/mspells1.c | 2 +- src/mutation/mutation.c | 2 +- src/object/object-hook.c | 2 +- src/object/warning.c | 2 +- src/player/avatar.c | 2 +- src/player/patron.c | 2 +- src/player/permanent-resistances.c | 2 +- src/player/player-damage.c | 2 +- src/player/player-effects.c | 2 +- src/player/player-move.c | 2 +- src/player/{player-races-types.h => player-race-types.h} | 1 + src/player/player-race.c | 2 +- src/player/player-status.c | 2 +- src/player/player-status.h | 2 +- src/player/race-info-table.h | 2 +- src/player/race-resistances.c | 2 +- src/player/selfinfo.c | 2 +- src/player/temporary-resistances.c | 2 +- src/realm/realm-nature.c | 2 +- src/store/store-owners.c | 2 +- src/system/building-type-definition.h | 2 +- src/view/display-main-window.c | 2 +- src/view/display-player-middle.c | 2 +- src/view/display-player-stat-info.c | 2 +- src/wizard/wizard-special-process.c | 2 +- src/world/world.c | 2 +- 54 files changed, 56 insertions(+), 55 deletions(-) rename src/player/{player-races-types.h => player-race-types.h} (98%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 7d8826d46..981784cd7 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -789,7 +789,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index d09f06fa0..c0c33ac24 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -2962,9 +2962,6 @@ player - - player - player @@ -2974,6 +2971,9 @@ system + + player + diff --git a/src/Makefile.am b/src/Makefile.am index 40185f18e..6e2d590cd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -430,7 +430,7 @@ hengband_SOURCES = \ player/player-move.c player/player-move.h \ player/player-personality.c player/player-personality.h \ player/player-race.c player/player-race.h \ - player/player-races-types.h \ + player/player-race-types.h \ player/player-skill.c player/player-skill.h \ player/player-status.c player/player-status.h \ player/player-personalities-types.h \ diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c index 7ed88a20b..9f9f5b205 100644 --- a/src/autopick/autopick-destroyer.c +++ b/src/autopick/autopick-destroyer.c @@ -19,7 +19,7 @@ #include "sv-definition/sv-other-types.h" #include "sv-definition/sv-wand-types.h" #include "player/player-move.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" /*! * @brief クラス依存のアイテム破壊を調べる diff --git a/src/birth/birth-body-spec.c b/src/birth/birth-body-spec.c index 68e08d24d..6d171bdca 100644 --- a/src/birth/birth-body-spec.c +++ b/src/birth/birth-body-spec.c @@ -1,7 +1,7 @@ #include "system/angband.h" #include "birth/birth-body-spec.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" /*! * @brief プレイヤーの身長体重を決める / Get character's height and weight diff --git a/src/birth/birth-stat.c b/src/birth/birth-stat.c index 68deda555..2b9c057fb 100644 --- a/src/birth/birth-stat.c +++ b/src/birth/birth-stat.c @@ -5,7 +5,7 @@ #include "player/player-personalities-types.h" #include "player/player-skill.h" #include "spell/spells-status.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" /*! * @brief プレイヤーの能力値表現に基づいて加減算を行う。 diff --git a/src/birth/character-builder.c b/src/birth/character-builder.c index e7148e270..f0fa062bf 100644 --- a/src/birth/character-builder.c +++ b/src/birth/character-builder.c @@ -22,7 +22,7 @@ #include "io/write-diary.h" #include "main/music-definitions-table.h" #include "monster-floor/monster-remover.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-sex.h" #include "store/store.h" #include "world/world.h" diff --git a/src/birth/game-play-initializer.c b/src/birth/game-play-initializer.c index 458277bd2..13d33714a 100644 --- a/src/birth/game-play-initializer.c +++ b/src/birth/game-play-initializer.c @@ -12,7 +12,7 @@ #include "object/object-generator.h" #include "object/object-kind.h" #include "pet/pet-util.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "system/system-variables.h" #include "world/world.h" diff --git a/src/birth/history-generator.c b/src/birth/history-generator.c index c6326b1ea..a80eaa177 100644 --- a/src/birth/history-generator.c +++ b/src/birth/history-generator.c @@ -1,7 +1,7 @@ #include "system/angband.h" #include "birth/history-generator.h" #include "birth/history.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" static int get_history_chart(player_type *creature_ptr) { diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c index 70db753ed..ad799970a 100644 --- a/src/birth/inventory-initializer.c +++ b/src/birth/inventory-initializer.c @@ -15,7 +15,7 @@ #include "object/object-kind.h" #include "object/object-info.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "sv-definition/sv-bow-types.h" #include "sv-definition/sv-food-types.h" #include "sv-definition/sv-lite-types.h" diff --git a/src/cmd-building/cmd-inn.c b/src/cmd-building/cmd-inn.c index f2dbad0ad..fa4d36286 100644 --- a/src/cmd-building/cmd-inn.c +++ b/src/cmd-building/cmd-inn.c @@ -6,7 +6,7 @@ #include "market/building-actions-table.h" #include "player/eldritch-horror.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "store/rumor.h" #include "world/world.h" diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c index feef9413a..805659ca7 100644 --- a/src/cmd-item/cmd-activate.c +++ b/src/cmd-item/cmd-activate.c @@ -42,7 +42,7 @@ #include "player/avatar.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "spell-kind/earthquake.h" #include "spell-kind/spells-beam.h" #include "spell-kind/spells-charm.h" diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c index 4ab54fa91..21c241ba7 100644 --- a/src/cmd-item/cmd-eat.c +++ b/src/cmd-item/cmd-eat.c @@ -24,7 +24,7 @@ #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "spell-realm/spells-hex.h" #include "spell/spells-status.h" diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c index ef1b3c30f..6e28afbd8 100644 --- a/src/cmd-item/cmd-item.c +++ b/src/cmd-item/cmd-item.c @@ -50,7 +50,7 @@ #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "player/selfinfo.h" #include "realm/realm-hex-numbers.h" diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c index 7dae63929..ccd2204eb 100644 --- a/src/cmd-item/cmd-quaff.c +++ b/src/cmd-item/cmd-quaff.c @@ -28,7 +28,7 @@ #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "player/selfinfo.h" #include "realm/realm-hex-numbers.h" diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c index 4a386b69f..04a975dbe 100644 --- a/src/cmd-item/cmd-usestaff.c +++ b/src/cmd-item/cmd-usestaff.c @@ -18,7 +18,7 @@ #include "player/avatar.h" #include "player/player-class.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "spell-kind/earthquake.h" #include "spell-kind/spells-detection.h" diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c index 1d5b2f52c..399e45888 100644 --- a/src/cmd/cmd-draw.c +++ b/src/cmd/cmd-draw.c @@ -2,7 +2,7 @@ #include "core/stuff-handler.h" #include "io/files-util.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/process-name.h" #include "term/gameterm.h" #include "term/term-color-types.h" diff --git a/src/core/game-play.c b/src/core/game-play.c index 4c4333196..7259113a4 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -53,7 +53,7 @@ #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-skill.h" #include "player/process-name.h" #include "realm/realm-names-table.h" diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c index 8b07c41e7..4e2a240ec 100644 --- a/src/core/hp-mp-processor.c +++ b/src/core/hp-mp-processor.c @@ -11,7 +11,7 @@ #include "object/object-flavor.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "realm/realm-song-numbers.h" #include "world/world.h" diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c index 09f9ab28e..e22ecf5cd 100644 --- a/src/core/turn-compensator.c +++ b/src/core/turn-compensator.c @@ -6,7 +6,7 @@ #include "store/store-owners.h" #include "store/store-util.h" #include "store/store.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" /*! * @brief ゲームターンからの実時間換算を行うための補正をかける diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 75f503abf..6173de3ab 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -8,7 +8,7 @@ #include "object/object-broken.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "spell/spells-status.h" #include "spell-kind/spells-teleport.h" #include "spell/spells3.h" diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c index 64e52d02b..73535813f 100644 --- a/src/effect/effect-player-switcher.c +++ b/src/effect/effect-player-switcher.c @@ -12,7 +12,7 @@ #include "player/mimic-info-table.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "spell/spell-types.h" #include "world/world.h" diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c index 92bec3fc7..39bc25a2c 100644 --- a/src/floor/pattern-walk.c +++ b/src/floor/pattern-walk.c @@ -9,7 +9,7 @@ #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "realm/realm-song-numbers.h" #include "spell/spells-status.h" #include "spell-kind/spells-teleport.h" diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c index ff4ed3cac..aa5b2081c 100644 --- a/src/inventory/inventory-curse.c +++ b/src/inventory/inventory-curse.c @@ -14,7 +14,7 @@ #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-move.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "spell-kind/spells-random.h" #include "spell-kind/spells-teleport.h" #include "spell/spells-summon.h" diff --git a/src/io/load.c b/src/io/load.c index 4c67a00ab..41bc8be7e 100644 --- a/src/io/load.c +++ b/src/io/load.c @@ -97,7 +97,7 @@ #include "player/patron.h" #include "player/player-class.h" #include "player/player-personality.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-sex.h" #include "player/player-skill.h" #include "player/race-info-table.h" diff --git a/src/io/targeting.c b/src/io/targeting.c index 81f3f2265..5a73ef43e 100644 --- a/src/io/targeting.c +++ b/src/io/targeting.c @@ -44,7 +44,7 @@ #include "object/object-kind-hook.h" #include "object/object-mark-types.h" #include "player/player-move.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "spell/spells-summon.h" #include "system/building-type-definition.h" diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c index 90934d094..1e4c673b8 100644 --- a/src/melee/melee-postprocess.c +++ b/src/melee/melee-postprocess.c @@ -32,7 +32,7 @@ #include "player/player-class.h" #include "player/player-move.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "util/util.h" // Melee-post-process-type diff --git a/src/mind/racial.c b/src/mind/racial.c index 41b4fab4a..641d3a0e5 100644 --- a/src/mind/racial.c +++ b/src/mind/racial.c @@ -39,7 +39,7 @@ #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "spell-kind/spells-beam.h" #include "spell-kind/spells-detection.h" diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c index 00f52b911..16dc78d9f 100644 --- a/src/mspell/mspells1.c +++ b/src/mspell/mspells1.c @@ -66,7 +66,7 @@ #include "object-enchant/object-curse.h" #include "player/player-class.h" #include "player/player-move.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "realm/realm-song-numbers.h" #include "spell-kind/spells-teleport.h" diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c index f560d7b10..340129c7a 100644 --- a/src/mutation/mutation.c +++ b/src/mutation/mutation.c @@ -41,7 +41,7 @@ #include "player/player-damage.h" #include "player/player-effects.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "player/selfinfo.h" #include "spell-kind/earthquake.h" diff --git a/src/object/object-hook.c b/src/object/object-hook.c index ed3fd4d0b..30847a5c0 100644 --- a/src/object/object-hook.c +++ b/src/object/object-hook.c @@ -22,7 +22,7 @@ #include "perception/object-perception.h" #include "player/mimic-info-table.h" #include "player/player-class.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-skill.h" #include "sv-definition/sv-armor-types.h" #include "sv-definition/sv-lite-types.h" diff --git a/src/object/warning.c b/src/object/warning.c index 754cdca37..92f584458 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -22,7 +22,7 @@ #include "player/mimic-info-table.h" #include "player/player-class.h" #include "player/player-move.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "spell/spell-types.h" #include "util/util.h" diff --git a/src/player/avatar.c b/src/player/avatar.c index 0a886c03c..dbc108fd7 100644 --- a/src/player/avatar.c +++ b/src/player/avatar.c @@ -16,7 +16,7 @@ #include "system/angband.h" #include "player/avatar.h" #include "realm/realm-names-table.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-class.h" /*! diff --git a/src/player/patron.c b/src/player/patron.c index bfdb2bfe7..a06bf5ec5 100644 --- a/src/player/patron.c +++ b/src/player/patron.c @@ -13,7 +13,7 @@ #include "player/player-class.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "spell-kind/spells-floor.h" #include "spell-kind/spells-genocide.h" diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c index dff3c1d60..6e87123da 100644 --- a/src/player/permanent-resistances.c +++ b/src/player/permanent-resistances.c @@ -1,6 +1,6 @@ #include "permanent-resistances.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "object-enchant/tr-types.h" /*! diff --git a/src/player/player-damage.c b/src/player/player-damage.c index ec092aa62..c12ea44f2 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -37,7 +37,7 @@ #include "player/player-effects.h" #include "player/player-move.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "realm/realm-song-numbers.h" #include "term/term-color-types.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index 416229f8a..98e697565 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -52,7 +52,7 @@ #include "player/player-move.h" #include "player/player-personalities-types.h" #include "player/player-personality.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-sex.h" #include "player/player-status.h" #include "player/race-info-table.h" diff --git a/src/player/player-move.c b/src/player/player-move.c index f0e7c976e..f8eab0479 100644 --- a/src/player/player-move.c +++ b/src/player/player-move.c @@ -184,7 +184,7 @@ #include "player/player-class.h" #include "player/player-effects.h" #include "player/player-personalities-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "realm/realm-song-numbers.h" #include "spell-kind/spells-floor.h" diff --git a/src/player/player-races-types.h b/src/player/player-race-types.h similarity index 98% rename from src/player/player-races-types.h rename to src/player/player-race-types.h index 979b47908..f58f5de85 100644 --- a/src/player/player-races-types.h +++ b/src/player/player-race-types.h @@ -42,4 +42,5 @@ typedef enum player_race_type { RACE_KUTAR = 35, RACE_ANDROID = 36, RACE_MERFOLK = 37, + MAX_RACES = 38, } player_race_type; diff --git a/src/player/player-race.c b/src/player/player-race.c index 9a12daf75..f6f098921 100644 --- a/src/player/player-race.c +++ b/src/player/player-race.c @@ -1,6 +1,6 @@ #include "system/angband.h" #include "player/player-race.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" const player_race *rp_ptr; diff --git a/src/player/player-status.c b/src/player/player-status.c index 89b3a2cd7..812b2b51c 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -54,7 +54,7 @@ #include "player/player-move.h" #include "player/player-personalities-types.h" #include "player/player-personality.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-skill.h" #include "player/race-info-table.h" #include "realm/realm-hex-numbers.h" diff --git a/src/player/player-status.h b/src/player/player-status.h index 434fc9728..a6a931adb 100644 --- a/src/player/player-status.h +++ b/src/player/player-status.h @@ -2,7 +2,7 @@ /* 人畜無害なenumヘッダを先に読み込む */ #include "player/player-classes-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "cmd-building/cmd-building.h" #include "player/player-personalities-types.h" #include "system/object-type-definition.h" diff --git a/src/player/race-info-table.h b/src/player/race-info-table.h index b88561ae2..02dc0ec9f 100644 --- a/src/player/race-info-table.h +++ b/src/player/race-info-table.h @@ -1,5 +1,5 @@ #pragma once -#define MAX_RACES 38 +#include "player/player-race-types.h" extern const player_race race_info[MAX_RACES]; diff --git a/src/player/race-resistances.c b/src/player/race-resistances.c index f86013bde..a45ef735c 100644 --- a/src/player/race-resistances.c +++ b/src/player/race-resistances.c @@ -1,5 +1,5 @@ #include "race-resistances.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "object/object-flags.h" #include "object-enchant/tr-types.h" diff --git a/src/player/selfinfo.c b/src/player/selfinfo.c index bc3f6395c..10f5965a3 100644 --- a/src/player/selfinfo.c +++ b/src/player/selfinfo.c @@ -20,7 +20,7 @@ #include "object/object-flags.h" #include "player/avatar.h" #include "player/player-class.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "realm/realm-names-table.h" #include "realm/realm-song-numbers.h" diff --git a/src/player/temporary-resistances.c b/src/player/temporary-resistances.c index 78cade6a8..90ef2bb2f 100644 --- a/src/player/temporary-resistances.c +++ b/src/player/temporary-resistances.c @@ -1,6 +1,6 @@ #include "temporary-resistances.h" #include "object-enchant/tr-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "realm/realm-hex-numbers.h" #include "realm/realm-song-numbers.h" #include "spell-realm/spells-hex.h" diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c index 3b8a18cd4..11bbdb783 100644 --- a/src/realm/realm-nature.c +++ b/src/realm/realm-nature.c @@ -11,7 +11,7 @@ #include "player/avatar.h" #include "player/player-damage.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "spell-kind/earthquake.h" #include "spell-kind/spells-beam.h" #include "spell-kind/spells-charm.h" diff --git a/src/store/store-owners.c b/src/store/store-owners.c index 598a7d710..869f93fa6 100644 --- a/src/store/store-owners.c +++ b/src/store/store-owners.c @@ -1,5 +1,5 @@ #include "store/store-owners.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" /*! * todo _() でまとめる diff --git a/src/system/building-type-definition.h b/src/system/building-type-definition.h index 447e7e1f3..96fa4b8f9 100644 --- a/src/system/building-type-definition.h +++ b/src/system/building-type-definition.h @@ -2,7 +2,7 @@ /* 人畜無害なenumヘッダを先に読み込む */ #include "player/player-classes-types.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "system/angband.h" #define MAX_BLDG 32 /*!< 施設の種類最大数 / Number of buildings */ diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c index 6d961730b..661167a9f 100644 --- a/src/view/display-main-window.c +++ b/src/view/display-main-window.c @@ -48,7 +48,7 @@ #include "player/mimic-info-table.h" #include "player/player-class.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-status.h" #include "realm/realm-hex-numbers.h" #include "realm/realm-song-numbers.h" diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c index 8022e2ebe..37b47469b 100644 --- a/src/view/display-player-middle.c +++ b/src/view/display-player-middle.c @@ -7,7 +7,7 @@ #include "object-enchant/special-object-flags.h" #include "perception/object-perception.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-skill.h" #include "realm/realm-song-numbers.h" #include "sv-definition/sv-bow-types.h" diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c index 4f13f3c28..eda744067 100644 --- a/src/view/display-player-stat-info.c +++ b/src/view/display-player-stat-info.c @@ -12,7 +12,7 @@ #include "player/mimic-info-table.h" #include "player/permanent-resistances.h" #include "player/player-personality.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "term/term-color-types.h" /*! diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index 2a00dd972..619f462d1 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -60,7 +60,7 @@ #include "player/patron.h" #include "player/player-class.h" #include "player/player-effects.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" #include "player/player-skill.h" #include "player/player-status.h" #include "player/selfinfo.h" diff --git a/src/world/world.c b/src/world/world.c index 816f83856..20d8a97c8 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -1,6 +1,6 @@ #include "system/angband.h" #include "world/world.h" -#include "player/player-races-types.h" +#include "player/player-race-types.h" world_type world; world_type *current_world_ptr = &world; -- 2.11.0