From 4928281ee7afb4800d28126f645ec14bf791d4ca Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 15 May 2020 20:30:10 +0900 Subject: [PATCH] [Refactor] #38862 Moved angband.h, h-*.h and system-variables.c/h --- Hengband/Hengband/Hengband.vcxproj | 16 ++++++------ Hengband/Hengband/Hengband.vcxproj.filters | 41 ++++++++++++++++++++---------- src/Makefile.am | 11 ++++---- src/artifact.c | 2 +- src/autopick/autopick-command-menu.c | 2 +- src/autopick/autopick-describer.c | 2 +- src/autopick/autopick-destroyer.c | 2 +- src/autopick/autopick-drawer.c | 2 +- src/autopick/autopick-editor-command.c | 2 +- src/autopick/autopick-editor-util.c | 2 +- src/autopick/autopick-entry.c | 2 +- src/autopick/autopick-finder.c | 2 +- src/autopick/autopick-initializer.c | 2 +- src/autopick/autopick-inserter-killer.c | 2 +- src/autopick/autopick-matcher.c | 2 +- src/autopick/autopick-menu-data-table.c | 2 +- src/autopick/autopick-pref-processor.c | 2 +- src/autopick/autopick-reader-writer.c | 2 +- src/autopick/autopick-registry.c | 2 +- src/autopick/autopick-util.c | 2 +- src/autopick/autopick.c | 2 +- src/avatar.c | 2 +- src/birth/birth-explanations-table.c | 2 +- src/birth/birth.c | 4 +-- src/character-dump.h | 2 +- src/chest.c | 2 +- src/chuukei.c | 2 +- src/cmd/cmd-activate.c | 2 +- src/cmd/cmd-autopick.c | 2 +- src/cmd/cmd-basic.c | 4 +-- src/cmd/cmd-diary.c | 2 +- src/cmd/cmd-draw.c | 2 +- src/cmd/cmd-dump.c | 2 +- src/cmd/cmd-eat.c | 2 +- src/cmd/cmd-gameoption.c | 2 +- src/cmd/cmd-help.h | 2 +- src/cmd/cmd-hissatsu.c | 2 +- src/cmd/cmd-inn.c | 2 +- src/cmd/cmd-item.c | 2 +- src/cmd/cmd-knowledge.c | 2 +- src/cmd/cmd-macro.c | 2 +- src/cmd/cmd-magiceat.c | 2 +- src/cmd/cmd-mane.c | 2 +- src/cmd/cmd-pet.c | 2 +- src/cmd/cmd-process-screen.c | 2 +- src/cmd/cmd-quaff.c | 2 +- src/cmd/cmd-read.c | 2 +- src/cmd/cmd-save.h | 2 +- src/cmd/cmd-smith.c | 2 +- src/cmd/cmd-spell.c | 2 +- src/cmd/cmd-usestaff.c | 2 +- src/cmd/cmd-visuals.c | 2 +- src/cmd/cmd-zaprod.c | 2 +- src/cmd/cmd-zapwand.c | 2 +- src/cmd/diary-subtitle-table.c | 2 +- src/cmd/dump-util.c | 2 +- src/cmd/feeling-table.c | 2 +- src/cmd/lighting-level-table.c | 2 +- src/cmd/monster-group-table.c | 2 +- src/cmd/object-group-table.c | 2 +- src/combat/melee.c | 2 +- src/combat/shoot.c | 2 +- src/core/game-closer.c | 2 +- src/core/game-play.c | 4 +-- src/core/hp-mp-processor.c | 2 +- src/core/hp-mp-regenerator.c | 2 +- src/core/magic-effects-timeout-reducer.c | 2 +- src/core/output-updater.c | 2 +- src/core/player-processor.c | 2 +- src/core/show-file.h | 2 +- src/core/stuff-handler.c | 2 +- src/core/turn-compensator.c | 2 +- src/creature.c | 2 +- src/dungeon/dungeon-file.c | 4 +-- src/dungeon/dungeon-processor.c | 2 +- src/dungeon/dungeon.c | 2 +- src/effect/effect-feature.c | 2 +- src/effect/effect-item.c | 2 +- src/effect/effect-monster-charm.c | 2 +- src/effect/effect-monster-curse.c | 2 +- src/effect/effect-monster-domination.c | 2 +- src/effect/effect-monster-evil.c | 2 +- src/effect/effect-monster-lite-dark.c | 2 +- src/effect/effect-monster-oldies.c | 2 +- src/effect/effect-monster-psi.c | 2 +- src/effect/effect-monster-resist-hurt.c | 2 +- src/effect/effect-monster-spirit.c | 2 +- src/effect/effect-monster-switcher.c | 2 +- src/effect/effect-monster-util.c | 2 +- src/effect/effect-monster.c | 2 +- src/effect/effect-player-curse.c | 2 +- src/effect/effect-player-oldies.c | 2 +- src/effect/effect-player-resist-hurt.c | 2 +- src/effect/effect-player-spirit.c | 2 +- src/effect/effect-player-switcher.c | 2 +- src/effect/effect-player.c | 2 +- src/effect/spells-effect-util.c | 2 +- src/english.c | 2 +- src/feature.c | 2 +- src/files.c | 4 +-- src/floor/floor-events.c | 2 +- src/floor/floor-generate.c | 4 +-- src/floor/floor-save.c | 4 +-- src/floor/floor-streams.c | 2 +- src/floor/floor-town.c | 2 +- src/floor/floor.c | 2 +- src/floor/pattern-walk.c | 2 +- src/gameterm.c | 4 +-- src/geometry.c | 2 +- src/grid.c | 2 +- src/history.c | 2 +- src/horror-descriptions.c | 2 +- src/inet.c | 2 +- src/init.c | 4 +-- src/init.h | 2 +- src/inventory/inventory-curse.c | 2 +- src/inventory/pack-overflow.c | 2 +- src/inventory/recharge-processor.c | 2 +- src/inventory/simple-appraiser.c | 2 +- src/io/dump-remover.c | 2 +- src/io/gf-descriptions.h | 2 +- src/io/input-key-processor.c | 2 +- src/io/interpret-pref-file.h | 2 +- src/io/mutations-dump.c | 2 +- src/io/player-status-dump.c | 2 +- src/io/read-pref-file.c | 4 +-- src/io/signal-handlers.c | 2 +- src/io/signal-handlers.h | 2 +- src/io/special-class-dump.c | 2 +- src/io/tokenizer.h | 2 +- src/io/write-diary.c | 2 +- src/io/write-diary.h | 2 +- src/japanese.c | 2 +- src/knowledge/knowledge-autopick.c | 2 +- src/knowledge/knowledge-experiences.c | 2 +- src/knowledge/knowledge-features.c | 2 +- src/knowledge/knowledge-inventory.c | 2 +- src/knowledge/knowledge-items.c | 2 +- src/knowledge/knowledge-monsters.c | 2 +- src/knowledge/knowledge-mutations.c | 2 +- src/knowledge/knowledge-quests.c | 4 +-- src/knowledge/knowledge-self.c | 2 +- src/knowledge/knowledge-uniques.c | 2 +- src/load.c | 4 +-- src/main-win.c | 4 +-- src/main/music-definitions-table.c | 2 +- src/main/sound-definitions-table.c | 2 +- src/market/arena-info-table.c | 2 +- src/market/articles-on-sale.c | 2 +- src/market/black-market.c | 2 +- src/market/building-util.c | 2 +- src/market/building.c | 4 +-- src/market/gold-magnification-table.c | 2 +- src/market/play-gamble.c | 2 +- src/market/poker.c | 2 +- src/market/say-comments.c | 2 +- src/market/store-owner-comments.c | 2 +- src/market/store-owners.c | 2 +- src/market/store-util.c | 2 +- src/market/store.c | 2 +- src/market/store.h | 2 +- src/mind.c | 2 +- src/monster/monster-attack.h | 2 +- src/monster/monster-direction.h | 2 +- src/monster/monster-dist-offsets.c | 2 +- src/monster/monster-move.h | 2 +- src/monster/monster-object.h | 2 +- src/monster/monster-process.c | 2 +- src/monster/monster-runaway.h | 2 +- src/monster/monster-safety-hiding.h | 2 +- src/monster/monster-status.c | 2 +- src/monster/monster-sweep-grid.h | 2 +- src/monster/monster-update.h | 2 +- src/monster/monster-util.c | 2 +- src/monster/monster1.c | 2 +- src/monster/monster2.c | 4 +-- src/monster/monsterrace-hook.c | 2 +- src/monster/monsterrace.c | 2 +- src/monster/quantum-effect.c | 2 +- src/mspells1.c | 2 +- src/mspells2.c | 2 +- src/mspells3.c | 2 +- src/mspells4.c | 2 +- src/mutation/mutation-processor.c | 2 +- src/mutation/mutation.c | 2 +- src/object/lite-processor.c | 2 +- src/object/object-boost.c | 2 +- src/object/object-broken.c | 2 +- src/object/object-curse.c | 2 +- src/object/object-ego.c | 2 +- src/object/object-flavor.c | 2 +- src/object/object-flavor.h | 2 +- src/object/object-hook.c | 2 +- src/object/object-kind-hook.c | 2 +- src/object/object-kind.c | 2 +- src/object/object1.c | 4 +-- src/object/object2.c | 2 +- src/patron.c | 2 +- src/player-inventory.c | 2 +- src/player/digestion-processor.c | 2 +- src/player/mimic-info-table.c | 2 +- src/player/permanent-resistances.h | 2 +- src/player/player-class.c | 2 +- src/player/player-damage.c | 2 +- src/player/player-effects.c | 2 +- src/player/player-move.c | 2 +- src/player/player-personality.c | 2 +- src/player/player-race.c | 2 +- src/player/player-sex.c | 2 +- src/player/player-skill.c | 2 +- src/player/player-status.c | 2 +- src/player/process-death.h | 2 +- src/player/process-name.h | 2 +- src/player/race-info-table.c | 2 +- src/player/race-resistances.h | 2 +- src/player/temporary-resistances.h | 2 +- src/quest.c | 4 +-- src/racial.c | 2 +- src/realm/realm-arcane.c | 2 +- src/realm/realm-chaos.c | 2 +- src/realm/realm-craft.c | 2 +- src/realm/realm-crusade.c | 2 +- src/realm/realm-daemon.c | 2 +- src/realm/realm-death.c | 2 +- src/realm/realm-hex.c | 2 +- src/realm/realm-hissatsu.c | 2 +- src/realm/realm-life.c | 2 +- src/realm/realm-nature.c | 2 +- src/realm/realm-song.c | 2 +- src/realm/realm-sorcery.c | 2 +- src/realm/realm-trump.c | 2 +- src/realm/realm.c | 2 +- src/report.c | 2 +- src/room/pit-nest-kinds-table.c | 2 +- src/room/rooms-city.c | 2 +- src/room/rooms-fractal.c | 2 +- src/room/rooms-normal.c | 2 +- src/room/rooms-pit-nest.c | 2 +- src/room/rooms-special.c | 2 +- src/room/rooms-trap.c | 2 +- src/room/rooms-vault.c | 2 +- src/room/rooms.c | 2 +- src/rumor.c | 2 +- src/save.c | 2 +- src/scores.c | 2 +- src/selfinfo.c | 2 +- src/snipe.c | 2 +- src/sort.c | 2 +- src/spell/music-checker.c | 2 +- src/spell/process-effect.c | 2 +- src/spell/spells-execution.c | 2 +- src/spell/spells1.c | 4 +-- src/spell/spells2.c | 4 +-- src/spell/spells3.c | 2 +- src/spell/technic-info-table.c | 2 +- src/spells-diceroll.c | 2 +- src/spells-floor.c | 2 +- src/spells-object.c | 2 +- src/spells-status.c | 2 +- src/spells-summon.c | 2 +- src/spells-world.c | 2 +- src/{ => system}/angband.h | 0 src/{ => system}/h-basic.h | 8 +++--- src/{ => system}/h-config.h | 0 src/{ => system}/h-define.h | 0 src/{ => system}/h-system.h | 0 src/{ => system}/h-type.h | 0 src/{core => system}/system-variables.c | 4 +-- src/{core => system}/system-variables.h | 0 src/targeting.c | 4 +-- src/trap.c | 2 +- src/util.c | 4 +-- src/view/display-characteristic.h | 2 +- src/view/display-fruit.c | 2 +- src/view/display-main-window.c | 4 +-- src/view/display-player-middle.h | 2 +- src/view/display-player-misc-info.c | 2 +- src/view/display-player-stat-info.c | 2 +- src/view/display-player.c | 2 +- src/view/display-player.h | 2 +- src/view/display-util.h | 2 +- src/view/status-first-page.c | 2 +- src/warning.c | 2 +- src/wild.c | 4 +-- src/wizard/wizard-special-process.c | 2 +- src/wizard/wizard-spoiler.c | 2 +- src/world/world-movement-processor.c | 2 +- src/world/world-turn-processor.c | 2 +- src/world/world.c | 2 +- src/z-form.h | 2 +- src/z-rand.h | 2 +- src/z-term.c | 2 +- src/z-term.h | 2 +- src/z-util.h | 2 +- src/z-virt.h | 2 +- 295 files changed, 354 insertions(+), 340 deletions(-) rename src/{ => system}/angband.h (100%) rename src/{ => system}/h-basic.h (88%) rename src/{ => system}/h-config.h (100%) rename src/{ => system}/h-define.h (100%) rename src/{ => system}/h-system.h (100%) rename src/{ => system}/h-type.h (100%) rename src/{core => system}/system-variables.c (92%) rename src/{core => system}/system-variables.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index b97f34fd4..b8dab6444 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -264,7 +264,7 @@ - + @@ -624,8 +624,8 @@ - - + + @@ -639,11 +639,11 @@ - - - - - + + + + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 567c2df11..9ea47b987 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -709,9 +709,6 @@ core - - core - floor @@ -829,14 +826,12 @@ inventory + + system + - - - - - @@ -896,9 +891,6 @@ spell - - core - player @@ -1577,9 +1569,6 @@ core - - core - floor @@ -1691,6 +1680,27 @@ inventory + + system + + + system + + + system + + + system + + + system + + + system + + + system + @@ -1772,6 +1782,9 @@ {b37a544f-cca2-4c1f-b069-f109a6b6b119} + + {12dd43b2-8ba5-4fc4-8d11-1901ec804390} + diff --git a/src/Makefile.am b/src/Makefile.am index aa4f6a6b3..beb46cab1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,9 @@ bin_PROGRAMS = hengband hengband_SOURCES = \ artifact.c artifact.h \ \ - angband.h\ + system/angband.h system/h-basic.h system/h-config.h \ + system/h-define.h system/h-system.h system/h-type.h \ + system/system-variables.c system/system-variables.h \ \ autopick/autopick.c autopick/autopick.h \ autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \ @@ -85,7 +87,6 @@ hengband_SOURCES = \ io/input-key-processor.c io/input-key-processor.h \ \ character-dump.c character-dump.h files.c files.h \ - core/system-variables.c core/system-variables.h \ core/game-play.c core/game-play.h \ core/show-file.c core/show-file.h \ core/stuff-handler.c core/stuff-handler.h \ @@ -112,9 +113,9 @@ hengband_SOURCES = \ geometry.c geometry.h \ \ gamevalue.h \ - grid.c grid.h h-basic.h h-config.h h-define.h \ + grid.c grid.h\ history.h history.c \ - h-system.h h-type.h inet.c inet.h init.c init.h \ + inet.c inet.h init.c init.h \ japanese.c japanese.h english.c english.h \ load.c load.h \ main.c main-x11.c main-gcu.c \ @@ -285,7 +286,7 @@ hengband_SOURCES = \ \ world/world.c world/world.h \ world/world-movement-processor.c world/world-movement-processor.h \ - world/world-turn-processor.c world/world-turn-processor.h \ + world/world-turn-processor.c world/world-turn-processor.h EXTRA_hengband_SOURCES = \ angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \ diff --git a/src/artifact.c b/src/artifact.c index dcf9bd140..ee3d4634a 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -10,7 +10,7 @@ * 2013 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "artifact.h" diff --git a/src/autopick/autopick-command-menu.c b/src/autopick/autopick-command-menu.c index ca1074cf7..40c426afb 100644 --- a/src/autopick/autopick-command-menu.c +++ b/src/autopick/autopick-command-menu.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-command-menu.h" #include "autopick/autopick-util.h" #include "autopick/autopick-menu-data-table.h" diff --git a/src/autopick/autopick-describer.c b/src/autopick/autopick-describer.c index 495f19d40..2015e8794 100644 --- a/src/autopick/autopick-describer.c +++ b/src/autopick/autopick-describer.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-describer.h" #include "autopick/autopick-key-flag-process.h" diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c index b61811718..f0b6281f8 100644 --- a/src/autopick/autopick-destroyer.c +++ b/src/autopick/autopick-destroyer.c @@ -3,7 +3,7 @@ * @date 2020/04/25 * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick-methods-table.h" #include "autopick/autopick-destroyer.h" diff --git a/src/autopick/autopick-drawer.c b/src/autopick/autopick-drawer.c index d47d20f73..9b69a40b7 100644 --- a/src/autopick/autopick-drawer.c +++ b/src/autopick/autopick-drawer.c @@ -3,7 +3,7 @@ * @date 2020/04/26 * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-drawer.h" #include "autopick/autopick-dirty-flags.h" diff --git a/src/autopick/autopick-editor-command.c b/src/autopick/autopick-editor-command.c index cd3a9d8fa..2cd32ee22 100644 --- a/src/autopick/autopick-editor-command.c +++ b/src/autopick/autopick-editor-command.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-editor-command.h" #include "autopick/autopick-editor-util.h" diff --git a/src/autopick/autopick-editor-util.c b/src/autopick/autopick-editor-util.c index 0b7f6db86..65e4c7ba4 100644 --- a/src/autopick/autopick-editor-util.c +++ b/src/autopick/autopick-editor-util.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-editor-util.h" #include "autopick/autopick-flags-table.h" diff --git a/src/autopick/autopick-entry.c b/src/autopick/autopick-entry.c index 158034a2f..315c8e35c 100644 --- a/src/autopick/autopick-entry.c +++ b/src/autopick/autopick-entry.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-entry.h" #include "autopick/autopick-flags-table.h" diff --git a/src/autopick/autopick-finder.c b/src/autopick/autopick-finder.c index 29b91e0c9..8e0c4e01a 100644 --- a/src/autopick/autopick-finder.c +++ b/src/autopick/autopick-finder.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-finder.h" #include "autopick/autopick-dirty-flags.h" #include "autopick/autopick-entry.h" diff --git a/src/autopick/autopick-initializer.c b/src/autopick/autopick-initializer.c index afc77e066..f9427e368 100644 --- a/src/autopick/autopick-initializer.c +++ b/src/autopick/autopick-initializer.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-entry.h" #include "autopick/autopick-initializer.h" diff --git a/src/autopick/autopick-inserter-killer.c b/src/autopick/autopick-inserter-killer.c index dcd17c9bf..ff8a2c707 100644 --- a/src/autopick/autopick-inserter-killer.c +++ b/src/autopick/autopick-inserter-killer.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-inserter-killer.h" #include "autopick/autopick-dirty-flags.h" diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c index e80757034..92f65e6a2 100644 --- a/src/autopick/autopick-matcher.c +++ b/src/autopick/autopick-matcher.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-key-flag-process.h" #include "autopick/autopick-flags-table.h" #include "autopick/autopick-matcher.h" diff --git a/src/autopick/autopick-menu-data-table.c b/src/autopick/autopick-menu-data-table.c index 7b5b9fbac..33871e0fd 100644 --- a/src/autopick/autopick-menu-data-table.c +++ b/src/autopick/autopick-menu-data-table.c @@ -3,7 +3,7 @@ * @date 2020/04/25 * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-editor-table.h" #include "autopick/autopick-commands-table.h" #include "autopick/autopick-keys-table.h" diff --git a/src/autopick/autopick-pref-processor.c b/src/autopick/autopick-pref-processor.c index 4afbcbfd3..bbca7ca19 100644 --- a/src/autopick/autopick-pref-processor.c +++ b/src/autopick/autopick-pref-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-pref-processor.h" #include "autopick/autopick-util.h" #include "autopick/autopick-entry.h" diff --git a/src/autopick/autopick-reader-writer.c b/src/autopick/autopick-reader-writer.c index 79875a37b..f55f1ef72 100644 --- a/src/autopick/autopick-reader-writer.c +++ b/src/autopick/autopick-reader-writer.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-reader-writer.h" #include "autopick/autopick-initializer.h" #include "autopick/autopick-pref-processor.h" diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c index 66652fd1e..82b932d37 100644 --- a/src/autopick/autopick-registry.c +++ b/src/autopick/autopick-registry.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-registry.h" #include "autopick/autopick-util.h" #include "autopick/autopick-methods-table.h" diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c index 8b8b5a430..c3b68834e 100644 --- a/src/autopick/autopick-util.c +++ b/src/autopick/autopick-util.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick-util.h" #include "autopick/autopick-menu-data-table.h" diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c index de1001476..15df4574c 100644 --- a/src/autopick/autopick.c +++ b/src/autopick/autopick.c @@ -11,7 +11,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "autopick/autopick-menu-data-table.h" #include "autopick/autopick-methods-table.h" diff --git a/src/avatar.c b/src/avatar.c index 664ba2cbf..fa6504fd2 100644 --- a/src/avatar.c +++ b/src/avatar.c @@ -13,7 +13,7 @@ included in all such copies. */ -#include "angband.h" +#include "system/angband.h" #include "avatar.h" #include "realm/realm.h" #include "player/player-race.h" diff --git a/src/birth/birth-explanations-table.c b/src/birth/birth-explanations-table.c index d7a5ce4bb..368164ab9 100644 --- a/src/birth/birth-explanations-table.c +++ b/src/birth/birth-explanations-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "birth/birth-explanations-table.h" /*! 種族の解説メッセージテーブル */ diff --git a/src/birth/birth.c b/src/birth/birth.c index 23fb18861..d071f8a34 100644 --- a/src/birth/birth.c +++ b/src/birth/birth.c @@ -11,8 +11,8 @@ * 2013 Deskull Doxygen向けのコメント整理\n */ -#include "angband.h" -#include "core/system-variables.h" +#include "system/angband.h" +#include "system/system-variables.h" #include "core/show-file.h" #include "gameterm.h" #include "io/read-pref-file.h" diff --git a/src/character-dump.h b/src/character-dump.h index ea354edb4..81664d708 100644 --- a/src/character-dump.h +++ b/src/character-dump.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "files.h" void make_character_dump(player_type *creature_ptr, FILE *fff, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name); diff --git a/src/chest.c b/src/chest.c index 2eb9da360..292633ffd 100644 --- a/src/chest.c +++ b/src/chest.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/chuukei.c b/src/chuukei.c index 9eb42b1bc..c3519d47d 100644 --- a/src/chuukei.c +++ b/src/chuukei.c @@ -6,7 +6,7 @@ 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "io/signal-handlers.h" #include "files.h" diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c index f4adf61bc..b3eb14124 100644 --- a/src/cmd/cmd-activate.c +++ b/src/cmd/cmd-activate.c @@ -6,7 +6,7 @@ * cmd6.cより分離。 */ -#include "angband.h" +#include "system/angband.h" #include "main/sound-definitions-table.h" #include "cmd/cmd-activate.h" diff --git a/src/cmd/cmd-autopick.c b/src/cmd/cmd-autopick.c index 2105d581c..f2dafaa4d 100644 --- a/src/cmd/cmd-autopick.c +++ b/src/cmd/cmd-autopick.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-autopick.h" #include "cmd/cmd-save.h" #include "autopick/autopick-util.h" diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index ea7622e3e..60e03b64d 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -10,10 +10,10 @@ * are included in all such copies. Other copyrights may also apply. */ -#include "angband.h" +#include "system/angband.h" #include "main/music-definitions-table.h" #include "main/sound-definitions-table.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/stuff-handler.h" #include "gameterm.h" diff --git a/src/cmd/cmd-diary.c b/src/cmd/cmd-diary.c index 339cddf8a..ef5f5ad3d 100644 --- a/src/cmd/cmd-diary.c +++ b/src/cmd/cmd-diary.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-diary.h" #include "chuukei.h" #include "core/show-file.h" diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c index bb3e86cc8..0c8cf28ec 100644 --- a/src/cmd/cmd-draw.c +++ b/src/cmd/cmd-draw.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "cmd/cmd-draw.h" #include "files.h" diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 6f561d7c1..bf98d7c17 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -30,7 +30,7 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-dump.h" #include "cmd/dump-util.h" #include "gameterm.h" diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c index ed56c8718..14d653ec9 100644 --- a/src/cmd/cmd-eat.c +++ b/src/cmd/cmd-eat.c @@ -7,7 +7,7 @@ */ -#include "angband.h" +#include "system/angband.h" #include "main/sound-definitions-table.h" #include "util.h" diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 0cffe6ae7..45a088760 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "autopick/autopick.h" #include "io/write-diary.h" diff --git a/src/cmd/cmd-help.h b/src/cmd/cmd-help.h index b141d9ebc..44d74a81b 100644 --- a/src/cmd/cmd-help.h +++ b/src/cmd/cmd-help.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void do_cmd_help(player_type *creature_ptr); diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c index 41d89f410..a39524a1a 100644 --- a/src/cmd/cmd-hissatsu.c +++ b/src/cmd/cmd-hissatsu.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-inn.c b/src/cmd/cmd-inn.c index 504a7bdce..828ba9efd 100644 --- a/src/cmd/cmd-inn.c +++ b/src/cmd/cmd-inn.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-inn.h" #include "cmd/cmd-magiceat.h" #include "io/write-diary.h" diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c index 3207fb734..5c2db57b0 100644 --- a/src/cmd/cmd-item.c +++ b/src/cmd/cmd-item.c @@ -10,7 +10,7 @@ * are included in all such copies. Other copyrights may also apply. */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-knowledge.c b/src/cmd/cmd-knowledge.c index 0902a9d0e..f9a5e2ac7 100644 --- a/src/cmd/cmd-knowledge.c +++ b/src/cmd/cmd-knowledge.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-knowledge.h" #include "cmd/cmd-draw.h" #include "knowledge/knowledge-autopick.h" diff --git a/src/cmd/cmd-macro.c b/src/cmd/cmd-macro.c index 78b72c295..866b8a1a4 100644 --- a/src/cmd/cmd-macro.c +++ b/src/cmd/cmd-macro.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd-macro.h" #include "cmd-gameoption.h" #include "files.h" diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c index ef6b0d88a..9d3754ca0 100644 --- a/src/cmd/cmd-magiceat.c +++ b/src/cmd/cmd-magiceat.c @@ -52,7 +52,7 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" #include "gameterm.h" diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c index 86959b09d..3f3af39b7 100644 --- a/src/cmd/cmd-mane.c +++ b/src/cmd/cmd-mane.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c index fd7eba704..a10d5a3bb 100644 --- a/src/cmd/cmd-pet.c +++ b/src/cmd/cmd-pet.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c index 3666da8f7..05e87b335 100644 --- a/src/cmd/cmd-process-screen.c +++ b/src/cmd/cmd-process-screen.c @@ -5,7 +5,7 @@ * @Author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-process-screen.h" #include "cmd/cmd-draw.h" #include "files.h" diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c index 6b92c35cf..0b2e22c68 100644 --- a/src/cmd/cmd-quaff.c +++ b/src/cmd/cmd-quaff.c @@ -6,7 +6,7 @@ * cmd6.cより分離。 */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c index 5521896b6..8857fb070 100644 --- a/src/cmd/cmd-read.c +++ b/src/cmd/cmd-read.c @@ -6,7 +6,7 @@ * cmd6.cより分離。 */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-save.h b/src/cmd/cmd-save.h index 835e696a5..1a5f362dc 100644 --- a/src/cmd/cmd-save.h +++ b/src/cmd/cmd-save.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void do_cmd_save_game(player_type *creature_ptr, int is_autosave); void do_cmd_save_and_exit(player_type *player_ptr); diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c index 06b8b8b10..0d176fafb 100644 --- a/src/cmd/cmd-smith.c +++ b/src/cmd/cmd-smith.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "gameterm.h" diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c index 1a6df001e..b6d2f54b9 100644 --- a/src/cmd/cmd-spell.c +++ b/src/cmd/cmd-spell.c @@ -6,7 +6,7 @@ 2013 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c index 17801dabc..644d17149 100644 --- a/src/cmd/cmd-usestaff.c +++ b/src/cmd/cmd-usestaff.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c index 03fc91264..48a68371b 100644 --- a/src/cmd/cmd-visuals.c +++ b/src/cmd/cmd-visuals.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/cmd-visuals.h" #include "cmd/cmd-draw.h" #include "knowledge/knowledge-features.h" diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c index 3ab902382..0604d3b50 100644 --- a/src/cmd/cmd-zaprod.c +++ b/src/cmd/cmd-zaprod.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c index ee76bc679..def5e675c 100644 --- a/src/cmd/cmd-zapwand.c +++ b/src/cmd/cmd-zapwand.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/cmd/diary-subtitle-table.c b/src/cmd/diary-subtitle-table.c index 4df968359..3ff054349 100644 --- a/src/cmd/diary-subtitle-table.c +++ b/src/cmd/diary-subtitle-table.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "diary-subtitle-table.h" concptr subtitle[MAX_SUBTITLE] = { diff --git a/src/cmd/dump-util.c b/src/cmd/dump-util.c index b7307e559..87a24d858 100644 --- a/src/cmd/dump-util.c +++ b/src/cmd/dump-util.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "feature.h" #include "dump-util.h" #include "gameterm.h" diff --git a/src/cmd/feeling-table.c b/src/cmd/feeling-table.c index 6d3efb0ba..1181133d6 100644 --- a/src/cmd/feeling-table.c +++ b/src/cmd/feeling-table.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "feeling-table.h" concptr do_cmd_feeling_text[MAX_FEELING_TEXT] = diff --git a/src/cmd/lighting-level-table.c b/src/cmd/lighting-level-table.c index 9134915b8..8daf77ea1 100644 --- a/src/cmd/lighting-level-table.c +++ b/src/cmd/lighting-level-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/lighting-level-table.h" #include "feature.h" diff --git a/src/cmd/monster-group-table.c b/src/cmd/monster-group-table.c index c40e157d8..4212b3127 100644 --- a/src/cmd/monster-group-table.c +++ b/src/cmd/monster-group-table.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "cmd/monster-group-table.h" /* diff --git a/src/cmd/object-group-table.c b/src/cmd/object-group-table.c index cd8c02dfd..f97dd251e 100644 --- a/src/cmd/object-group-table.c +++ b/src/cmd/object-group-table.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "object-group-table.h" #include "object/object.h" diff --git a/src/combat/melee.c b/src/combat/melee.c index aa688a9ef..4260e3604 100644 --- a/src/combat/melee.c +++ b/src/combat/melee.c @@ -11,7 +11,7 @@ * @details */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/combat/shoot.c b/src/combat/shoot.c index 07c1421d5..3334bab14 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/core/game-closer.c b/src/core/game-closer.c index 9b624d102..be87d9b59 100644 --- a/src/core/game-closer.c +++ b/src/core/game-closer.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/game-closer.h" #include "cmd/cmd-save.h" #include "core/stuff-handler.h" diff --git a/src/core/game-play.c b/src/core/game-play.c index f1113f133..7b82f7761 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -10,7 +10,7 @@ * 2013 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "core/game-play.h" #include "io/signal-handlers.h" #include "util.h" @@ -56,7 +56,7 @@ #include "scores.h" #include "targeting.h" #include "view/display-main-window.h" -#include "core/system-variables.h" +#include "system/system-variables.h" /*! * @brief 1ゲームプレイの主要ルーチン / Actually play a game diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c index a06f18621..0787d1c20 100644 --- a/src/core/hp-mp-processor.c +++ b/src/core/hp-mp-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/hp-mp-processor.h" #include "realm/realm-song.h" #include "player/player-damage.h" diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c index a56bb43c4..29acf3486 100644 --- a/src/core/hp-mp-regenerator.c +++ b/src/core/hp-mp-regenerator.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/hp-mp-regenerator.h" #include "cmd/cmd-magiceat.h" #include "monster/monster-status.h" diff --git a/src/core/magic-effects-timeout-reducer.c b/src/core/magic-effects-timeout-reducer.c index 7923a4729..1faa188ef 100644 --- a/src/core/magic-effects-timeout-reducer.c +++ b/src/core/magic-effects-timeout-reducer.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/magic-effects-timeout-reducer.h" #include "player/player-effects.h" diff --git a/src/core/output-updater.c b/src/core/output-updater.c index 9d576943e..ab577b72a 100644 --- a/src/core/output-updater.c +++ b/src/core/output-updater.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "core/output-updater.h" #include "view/display-main-window.h" diff --git a/src/core/player-processor.c b/src/core/player-processor.c index b473b0ed0..1db9a17a6 100644 --- a/src/core/player-processor.c +++ b/src/core/player-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/player-processor.h" #include "player/player-move.h" #include "player/player-skill.h" diff --git a/src/core/show-file.h b/src/core/show-file.h index 685cd4500..2401f06f2 100644 --- a/src/core/show-file.h +++ b/src/core/show-file.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" bool show_file(player_type *player_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode); diff --git a/src/core/stuff-handler.c b/src/core/stuff-handler.c index cae7ee71a..045dedc5c 100644 --- a/src/core/stuff-handler.c +++ b/src/core/stuff-handler.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "view/display-main-window.h" diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c index 1a2f9d306..3b64701b8 100644 --- a/src/core/turn-compensator.c +++ b/src/core/turn-compensator.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/turn-compensator.h" #include "world/world.h" #include "floor/floor-town.h" diff --git a/src/creature.c b/src/creature.c index a192c5d8d..0b4afa044 100644 --- a/src/creature.c +++ b/src/creature.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "creature.h" /*! diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c index 6943cf745..a2d460f3d 100644 --- a/src/dungeon/dungeon-file.c +++ b/src/dungeon/dungeon-file.c @@ -31,9 +31,9 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "util.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "io/tokenizer.h" #include "files.h" diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c index 4ff3e902a..3eea6cc24 100644 --- a/src/dungeon/dungeon-processor.c +++ b/src/dungeon/dungeon-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "dungeon/dungeon-processor.h" #include "world/world.h" #include "targeting.h" diff --git a/src/dungeon/dungeon.c b/src/dungeon/dungeon.c index 88b40cc3d..4d19e8494 100644 --- a/src/dungeon/dungeon.c +++ b/src/dungeon/dungeon.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "dungeon/dungeon.h" #include "world/world.h" diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c index e6df9fdc2..16b2d4402 100644 --- a/src/effect/effect-feature.c +++ b/src/effect/effect-feature.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-feature.h" #include "room/rooms.h" #include "dungeon/dungeon.h" diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c index ff9bb61c5..c35524172 100644 --- a/src/effect/effect-item.c +++ b/src/effect/effect-item.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect-item.h" #include "object/object-flavor.h" #include "object/object-hook.h" diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c index 0f45f44e9..f2b0f5a8f 100644 --- a/src/effect/effect-monster-charm.c +++ b/src/effect/effect-monster-charm.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-charm.h" #include "avatar.h" diff --git a/src/effect/effect-monster-curse.c b/src/effect/effect-monster-curse.c index 890cacd18..4116a70b2 100644 --- a/src/effect/effect-monster-curse.c +++ b/src/effect/effect-monster-curse.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-curse.h" diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c index af999bd55..359abd614 100644 --- a/src/effect/effect-monster-domination.c +++ b/src/effect/effect-monster-domination.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-domination.h" #include "player/player-effects.h" diff --git a/src/effect/effect-monster-evil.c b/src/effect/effect-monster-evil.c index b8bcc7851..9bb61ffaf 100644 --- a/src/effect/effect-monster-evil.c +++ b/src/effect/effect-monster-evil.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-evil.h" #include "monster/monsterrace-hook.h" diff --git a/src/effect/effect-monster-lite-dark.c b/src/effect/effect-monster-lite-dark.c index 7d4c274ff..f15c8a2fc 100644 --- a/src/effect/effect-monster-lite-dark.c +++ b/src/effect/effect-monster-lite-dark.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-lite-dark.h" diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c index 4b6b7ee37..16e182ac8 100644 --- a/src/effect/effect-monster-oldies.c +++ b/src/effect/effect-monster-oldies.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-oldies.h" #include "avatar.h" diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c index b844924da..240f1db06 100644 --- a/src/effect/effect-monster-psi.c +++ b/src/effect/effect-monster-psi.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-psi.h" #include "player/player-damage.h" diff --git a/src/effect/effect-monster-resist-hurt.c b/src/effect/effect-monster-resist-hurt.c index fede5e6c1..505810ba7 100644 --- a/src/effect/effect-monster-resist-hurt.c +++ b/src/effect/effect-monster-resist-hurt.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-resist-hurt.h" #include "monster/monster-status.h" diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c index 691ec59ac..dd2596ecf 100644 --- a/src/effect/effect-monster-spirit.c +++ b/src/effect/effect-monster-spirit.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" #include "effect/effect-monster-spirit.h" #include "monster-spell.h" diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c index e456c57e6..906920aa2 100644 --- a/src/effect/effect-monster-switcher.c +++ b/src/effect/effect-monster-switcher.c @@ -6,7 +6,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "effect-monster-util.h" #include "effect/effect-monster-switcher.h" #include "player/player-damage.h" diff --git a/src/effect/effect-monster-util.c b/src/effect/effect-monster-util.c index 5ac1f4225..bcddf46a6 100644 --- a/src/effect/effect-monster-util.c +++ b/src/effect/effect-monster-util.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster-util.h" /*! diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c index 03c054205..634be8a14 100644 --- a/src/effect/effect-monster.c +++ b/src/effect/effect-monster.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-monster.h" #include "spells-effect-util.h" #include "io/write-diary.h" diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c index d53b6d18b..af30954b5 100644 --- a/src/effect/effect-player-curse.c +++ b/src/effect/effect-player-curse.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player-curse.h" #include "player/player-damage.h" diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c index e5da4fe4c..3e255234f 100644 --- a/src/effect/effect-player-oldies.c +++ b/src/effect/effect-player-oldies.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player-oldies.h" #include "player/player-effects.h" diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 9183fc896..dc4af21ee 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player-resist-hurt.h" #include "player/player-damage.h" diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c index dff492135..ad596b087 100644 --- a/src/effect/effect-player-spirit.c +++ b/src/effect/effect-player-spirit.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player-spirit.h" #include "monster-spell.h" diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c index 8450e6f51..ae8d9770d 100644 --- a/src/effect/effect-player-switcher.c +++ b/src/effect/effect-player-switcher.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect-player-util.h" #include "effect/effect-player-curse.h" #include "effect/effect-player-switcher.h" diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c index 304ead04b..8958dc623 100644 --- a/src/effect/effect-player.c +++ b/src/effect/effect-player.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "effect/effect-player-util.h" #include "effect/effect-player.h" #include "effect/effect-player-switcher.h" diff --git a/src/effect/spells-effect-util.c b/src/effect/spells-effect-util.c index 98508680b..6de779be3 100644 --- a/src/effect/spells-effect-util.c +++ b/src/effect/spells-effect-util.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/spells-effect-util.h" int rakubadam_m; diff --git a/src/english.c b/src/english.c index 4acee5637..415fa498f 100644 --- a/src/english.c +++ b/src/english.c @@ -1,5 +1,5 @@  -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "japanese.h" diff --git a/src/feature.c b/src/feature.c index e63a1f9b9..e23012adb 100644 --- a/src/feature.c +++ b/src/feature.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "feature.h" /*** Terrain feature variables ***/ diff --git a/src/files.c b/src/files.c index ef9b2561b..8580fbb0e 100644 --- a/src/files.c +++ b/src/files.c @@ -12,10 +12,10 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "io/uid-checker.h" #include "files.h" -#include "core/system-variables.h" // 暫定。後で消す. +#include "system/system-variables.h" // 暫定。後で消す. #include "character-dump.h" concptr ANGBAND_DIR; //!< Path name: The main "lib" directory This variable is not actually used anywhere in the code diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c index ed92112e1..ceaf80868 100644 --- a/src/floor/floor-events.c +++ b/src/floor/floor-events.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "dungeon/dungeon.h" diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c index 6885a8fc9..12d93fa74 100644 --- a/src/floor/floor-generate.c +++ b/src/floor/floor-generate.c @@ -96,9 +96,9 @@ * way from granite. \n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "market/building.h" #include "io/write-diary.h" diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c index 4ea45bd2d..4b815c617 100644 --- a/src/floor/floor-save.c +++ b/src/floor/floor-save.c @@ -10,9 +10,9 @@ * 2014 Deskull rearranged comment for Doxygen. \n */ -#include "angband.h" +#include "system/angband.h" #include "market/building.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "load.h" #include "util.h" diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c index 86f2e74c1..22e1be5fc 100644 --- a/src/floor/floor-streams.c +++ b/src/floor/floor-streams.c @@ -15,7 +15,7 @@ * generated, ie streams and level destruction. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "artifact.h" diff --git a/src/floor/floor-town.c b/src/floor/floor-town.c index b998ad209..b649aa5e2 100644 --- a/src/floor/floor-town.c +++ b/src/floor/floor-town.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "floor/floor-town.h" /* diff --git a/src/floor/floor.c b/src/floor/floor.c index 772973960..df61af4b3 100644 --- a/src/floor/floor.c +++ b/src/floor/floor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "floor/floor.h" #include "floor/floor-save.h" #include "floor/floor-generate.h" diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c index a52251e64..4273aa3da 100644 --- a/src/floor/pattern-walk.c +++ b/src/floor/pattern-walk.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "floor/pattern-walk.h" #include "dungeon/dungeon.h" #include "io/write-diary.h" diff --git a/src/gameterm.c b/src/gameterm.c index 02082faa2..a1b4378a1 100644 --- a/src/gameterm.c +++ b/src/gameterm.c @@ -1,8 +1,8 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "gameterm.h" -#include "core/system-variables.h" +#include "system/system-variables.h" /* diff --git a/src/geometry.c b/src/geometry.c index ec2402197..770c8cf84 100644 --- a/src/geometry.c +++ b/src/geometry.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "floor/floor.h" /*! diff --git a/src/grid.c b/src/grid.c index 2c64e1c5a..830510356 100644 --- a/src/grid.c +++ b/src/grid.c @@ -15,7 +15,7 @@ * 2013 Deskull Doxygen向けのコメント整理\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "gameterm.h" diff --git a/src/history.c b/src/history.c index d664c7dcc..48f6ffce3 100644 --- a/src/history.c +++ b/src/history.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "history.h" diff --git a/src/horror-descriptions.c b/src/horror-descriptions.c index fd5c3b4f5..beb5ae76f 100644 --- a/src/horror-descriptions.c +++ b/src/horror-descriptions.c @@ -7,7 +7,7 @@ * いくら増やしてもよいが、horror_desc_evil とhorror_desc_neutralの個数は同一にすること */ -#include "angband.h" +#include "system/angband.h" #include "horror-descriptions.h" /*! diff --git a/src/inet.c b/src/inet.c index d5e219177..19ddb8b68 100644 --- a/src/inet.c +++ b/src/inet.c @@ -1,6 +1,6 @@ /* File: inet.c */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "files.h" #include "inet.h" diff --git a/src/init.c b/src/init.c index 9993fb99b..725f7fd9f 100644 --- a/src/init.c +++ b/src/init.c @@ -30,11 +30,11 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "io/uid-checker.h" #include "files.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/angband-version.h" #include "io/read-pref-file.h" #include "gameterm.h" diff --git a/src/init.h b/src/init.h index 46e0af431..eb74b7e95 100644 --- a/src/init.h +++ b/src/init.h @@ -13,7 +13,7 @@ #ifndef INCLUDED_INIT_H #define INCLUDED_INIT_H -#include "h-basic.h" +#include "system/h-basic.h" typedef struct header header; diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c index 6ab659860..50f6c0f35 100644 --- a/src/inventory/inventory-curse.c +++ b/src/inventory/inventory-curse.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "inventory/inventory-curse.h" #include "object/object-flavor.h" #include "spells-summon.h" diff --git a/src/inventory/pack-overflow.c b/src/inventory/pack-overflow.c index f5939ecd4..cea9ad811 100644 --- a/src/inventory/pack-overflow.c +++ b/src/inventory/pack-overflow.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "inventory/pack-overflow.h" #include "player/player-move.h" #include "object/object-flavor.h" diff --git a/src/inventory/recharge-processor.c b/src/inventory/recharge-processor.c index 217150781..c5eef3127 100644 --- a/src/inventory/recharge-processor.c +++ b/src/inventory/recharge-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "object/object-flavor.h" #include "player/player-move.h" #include "core/hp-mp-regenerator.h" diff --git a/src/inventory/simple-appraiser.c b/src/inventory/simple-appraiser.c index 2c9b97ba3..d83b7d1eb 100644 --- a/src/inventory/simple-appraiser.c +++ b/src/inventory/simple-appraiser.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "inventory/simple-appraiser.h" #include "object/object-flavor.h" #include "avatar.h" diff --git a/src/io/dump-remover.c b/src/io/dump-remover.c index 298382ecb..4e002719c 100644 --- a/src/io/dump-remover.c +++ b/src/io/dump-remover.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd/dump-util.h" #include "io/dump-remover.h" #include "io/read-pref-file.h" diff --git a/src/io/gf-descriptions.h b/src/io/gf-descriptions.h index 3c6364b40..f3934cb50 100644 --- a/src/io/gf-descriptions.h +++ b/src/io/gf-descriptions.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #define MAX_NAMED_NUM 99 diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index d1bde2eec..2011b331a 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "io/input-key-processor.h" #include "world/world.h" #include "core/special-internal-keys.h" diff --git a/src/io/interpret-pref-file.h b/src/io/interpret-pref-file.h index 77c65c3ea..9f1e62f1e 100644 --- a/src/io/interpret-pref-file.h +++ b/src/io/interpret-pref-file.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" errr interpret_pref_file(player_type *creature_ptr, char *buf); diff --git a/src/io/mutations-dump.c b/src/io/mutations-dump.c index c48c11d94..534e26173 100644 --- a/src/io/mutations-dump.c +++ b/src/io/mutations-dump.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "io/mutations-dump.h" /*! diff --git a/src/io/player-status-dump.c b/src/io/player-status-dump.c index 8e3fc0a2f..12010ae3f 100644 --- a/src/io/player-status-dump.c +++ b/src/io/player-status-dump.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "files.h" #include "io/player-status-dump.h" diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c index 278039e1d..851de6b8c 100644 --- a/src/io/read-pref-file.c +++ b/src/io/read-pref-file.c @@ -14,14 +14,14 @@ * Add a footer, and close the file. */ -#include "angband.h" +#include "system/angband.h" #include "io/dump-remover.h" #include "io/read-pref-file.h" #include "io/interpret-pref-file.h" #include "autopick/autopick-pref-processor.h" #include "files.h" // 暫定。コールバック化して後で消す. #include "world/world.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "autopick/autopick-reader-writer.h" // todo コールバック関数に変更するので、いずれ消す. diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c index a6dd61169..e4b38a09d 100644 --- a/src/io/signal-handlers.c +++ b/src/io/signal-handlers.c @@ -6,7 +6,7 @@ */ #include "io/signal-handlers.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/game-closer.h" #include "save.h" #include "world/world.h" diff --git a/src/io/signal-handlers.h b/src/io/signal-handlers.h index 34f5a8b57..47f712ad7 100644 --- a/src/io/signal-handlers.h +++ b/src/io/signal-handlers.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" extern s16b signal_count; extern void signals_ignore_tstp(void); diff --git a/src/io/special-class-dump.c b/src/io/special-class-dump.c index 2625a053b..5b7a82c4b 100644 --- a/src/io/special-class-dump.c +++ b/src/io/special-class-dump.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "special-class-dump.h" #include "cmd/cmd-magiceat.h" #include "object/object-kind.h" diff --git a/src/io/tokenizer.h b/src/io/tokenizer.h index 9c4812463..bc9c5ab8d 100644 --- a/src/io/tokenizer.h +++ b/src/io/tokenizer.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #define TOKENIZE_CHECKQUOTE 0x01 /* Special handling of single quotes */ diff --git a/src/io/write-diary.c b/src/io/write-diary.c index ea7bc0123..37520b6d9 100644 --- a/src/io/write-diary.c +++ b/src/io/write-diary.c @@ -5,7 +5,7 @@ */ #include "io/write-diary.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "quest.h" #include "files.h" #include "dungeon/dungeon.h" diff --git a/src/io/write-diary.h b/src/io/write-diary.h index 8a3396c06..cee0d8727 100644 --- a/src/io/write-diary.h +++ b/src/io/write-diary.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #define DIARY_DIALY 0 #define DIARY_DESCRIPTION 1 diff --git a/src/japanese.c b/src/japanese.c index f09c4fa01..b89d9ae09 100644 --- a/src/japanese.c +++ b/src/japanese.c @@ -4,7 +4,7 @@ * @date 2014/07/07 */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "japanese.h" diff --git a/src/knowledge/knowledge-autopick.c b/src/knowledge/knowledge-autopick.c index b380b9834..1dec1b57b 100644 --- a/src/knowledge/knowledge-autopick.c +++ b/src/knowledge/knowledge-autopick.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge/knowledge-autopick.h" #include "cmd/dump-util.h" #include "core/show-file.h" diff --git a/src/knowledge/knowledge-experiences.c b/src/knowledge/knowledge-experiences.c index f907ce6dd..5c7f4c3cc 100644 --- a/src/knowledge/knowledge-experiences.c +++ b/src/knowledge/knowledge-experiences.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge-experiences.h" #include "cmd/dump-util.h" #include "core/show-file.h" diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c index 9e3c0b5e9..07d7c3604 100644 --- a/src/knowledge/knowledge-features.c +++ b/src/knowledge/knowledge-features.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge/knowledge-features.h" #include "cmd/dump-util.h" #include "core/show-file.h" diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c index ed4cc5ec6..a41e5d8b6 100644 --- a/src/knowledge/knowledge-inventory.c +++ b/src/knowledge/knowledge-inventory.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge/knowledge-inventory.h" #include "cmd/dump-util.h" #include "core/show-file.h" diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c index 5a90c867f..1ab205db9 100644 --- a/src/knowledge/knowledge-items.c +++ b/src/knowledge/knowledge-items.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge-items.h" #include "cmd/dump-util.h" #include "artifact.h" diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c index 4f1910953..259bb519d 100644 --- a/src/knowledge/knowledge-monsters.c +++ b/src/knowledge/knowledge-monsters.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge/knowledge-monsters.h" #include "cmd/dump-util.h" #include "sort.h" diff --git a/src/knowledge/knowledge-mutations.c b/src/knowledge/knowledge-mutations.c index 23526ebc2..da5579bac 100644 --- a/src/knowledge/knowledge-mutations.c +++ b/src/knowledge/knowledge-mutations.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge/knowledge-mutations.h" #include "cmd/dump-util.h" #include "core/show-file.h" diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c index 8f0780c55..4541e16ce 100644 --- a/src/knowledge/knowledge-quests.c +++ b/src/knowledge/knowledge-quests.c @@ -4,11 +4,11 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge-quests.h" #include "cmd/dump-util.h" #include "quest.h" -#include "core/system-variables.h" // 暫定、init_flagsのため。後で消すかも. +#include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも. #include "artifact.h" #include "object/object-flavor.h" #include "dungeon/dungeon.h" diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c index 1a331ab94..7514993f3 100644 --- a/src/knowledge/knowledge-self.c +++ b/src/knowledge/knowledge-self.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge-self.h" #include "cmd/dump-util.h" #include "avatar.h" diff --git a/src/knowledge/knowledge-uniques.c b/src/knowledge/knowledge-uniques.c index 711547a98..0e6bdd3ef 100644 --- a/src/knowledge/knowledge-uniques.c +++ b/src/knowledge/knowledge-uniques.c @@ -4,7 +4,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "knowledge-items.h" #include "cmd/dump-util.h" #include "sort.h" diff --git a/src/load.c b/src/load.c index 1b24e63d3..6c0a033d7 100644 --- a/src/load.c +++ b/src/load.c @@ -40,9 +40,9 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "util.h" -#include "core/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す. +#include "system/system-variables.h" // 暫定、init_flags の扱いを決めた上で消す. #include "core/angband-version.h" #include "load.h" diff --git a/src/main-win.c b/src/main-win.c index 6d78e0e1a..939cf05dd 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -89,7 +89,7 @@ *

*/ -#include "angband.h" +#include "system/angband.h" #include "io/signal-handlers.h" #include "main/sound-definitions-table.h" #include "main/music-definitions-table.h" @@ -109,7 +109,7 @@ #include "scores.h" #include "quest.h" #include "files.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/game-play.h" #include "core/angband-version.h" #include "core/stuff-handler.h" diff --git a/src/main/music-definitions-table.c b/src/main/music-definitions-table.c index 6c8c35808..0767cb916 100644 --- a/src/main/music-definitions-table.c +++ b/src/main/music-definitions-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "main/music-definitions-table.h" const concptr angband_music_basic_name[MUSIC_BASIC_MAX] = diff --git a/src/main/sound-definitions-table.c b/src/main/sound-definitions-table.c index 99ac852c5..9f3f97655 100644 --- a/src/main/sound-definitions-table.c +++ b/src/main/sound-definitions-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "main/sound-definitions-table.h" const concptr angband_sound_name[SOUND_MAX] = diff --git a/src/market/arena-info-table.c b/src/market/arena-info-table.c index e89edafbb..60881a123 100644 --- a/src/market/arena-info-table.c +++ b/src/market/arena-info-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "arena-info-table.h" /*! diff --git a/src/market/articles-on-sale.c b/src/market/articles-on-sale.c index 956bf7e88..3636ecd7c 100644 --- a/src/market/articles-on-sale.c +++ b/src/market/articles-on-sale.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "store-owners.h" #include "articles-on-sale.h" diff --git a/src/market/black-market.c b/src/market/black-market.c index 0ba0af4ab..c090ba381 100644 --- a/src/market/black-market.c +++ b/src/market/black-market.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "floor/floor-town.h" #include "object/object-hook.h" #include "market/black-market.h" diff --git a/src/market/building-util.c b/src/market/building-util.c index eef057aa3..150d81c87 100644 --- a/src/market/building-util.c +++ b/src/market/building-util.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "market/building-util.h" /*! diff --git a/src/market/building.c b/src/market/building.c index 35aa0fc07..2d2d74823 100644 --- a/src/market/building.c +++ b/src/market/building.c @@ -12,12 +12,12 @@ * Changed for ZAngband by Robert Ruehlmann */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/music-definitions-table.h" #include "gameterm.h" -#include "core/system-variables.h" // 暫定、init_flags のため。後で消すかも. +#include "system/system-variables.h" // 暫定、init_flags のため。後で消すかも. #include "core/stuff-handler.h" #include "core/show-file.h" #include "core/special-internal-keys.h" diff --git a/src/market/gold-magnification-table.c b/src/market/gold-magnification-table.c index cc77e34c2..5140f2d69 100644 --- a/src/market/gold-magnification-table.c +++ b/src/market/gold-magnification-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "market/gold-magnification-table.h" /* diff --git a/src/market/play-gamble.c b/src/market/play-gamble.c index f3de8fc98..ed57031c2 100644 --- a/src/market/play-gamble.c +++ b/src/market/play-gamble.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "play-gamble.h" #include "gameterm.h" #include "avatar.h" diff --git a/src/market/poker.c b/src/market/poker.c index ad96a6c2c..d9ece225e 100644 --- a/src/market/poker.c +++ b/src/market/poker.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "poker.h" #include "gameterm.h" diff --git a/src/market/say-comments.c b/src/market/say-comments.c index 973a961da..9795f4661 100644 --- a/src/market/say-comments.c +++ b/src/market/say-comments.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "say-comments.h" #include "main/sound-definitions-table.h" #include "market/store-owner-comments.h" diff --git a/src/market/store-owner-comments.c b/src/market/store-owner-comments.c index 17687de12..ebda3d821 100644 --- a/src/market/store-owner-comments.c +++ b/src/market/store-owner-comments.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "store-owner-comments.h" /*! diff --git a/src/market/store-owners.c b/src/market/store-owners.c index a9cb14392..3cf620f90 100644 --- a/src/market/store-owners.c +++ b/src/market/store-owners.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "store-owners.h" /*! diff --git a/src/market/store-util.c b/src/market/store-util.c index a1ce936cf..e93912f3e 100644 --- a/src/market/store-util.c +++ b/src/market/store-util.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "market/store-util.h" #include "object/object-hook.h" #include "object/object-kind.h" diff --git a/src/market/store.c b/src/market/store.c index 4bc6ba14f..8166acca4 100644 --- a/src/market/store.c +++ b/src/market/store.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "market/say-comments.h" #include "market/store-owners.h" #include "market/store-util.h" diff --git a/src/market/store.h b/src/market/store.h index 282f0f2a5..63ae83bec 100644 --- a/src/market/store.h +++ b/src/market/store.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "market/store-owners.h" /* diff --git a/src/mind.c b/src/mind.c index 3f29e1177..c55c794d4 100644 --- a/src/mind.c +++ b/src/mind.c @@ -14,7 +14,7 @@ * 特殊技能を揃えて実装している。 */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/monster/monster-attack.h b/src/monster/monster-attack.h index a462d467e..fa019ddff 100644 --- a/src/monster/monster-attack.h +++ b/src/monster/monster-attack.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx); diff --git a/src/monster/monster-direction.h b/src/monster/monster-direction.h index 48637c538..748eba741 100644 --- a/src/monster/monster-direction.h +++ b/src/monster/monster-direction.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" bool get_enemy_dir(player_type *target_ptr, MONSTER_IDX m_idx, int *mm); bool decide_monster_movement_direction(player_type *target_ptr, DIRECTION *mm, MONSTER_IDX m_idx, bool aware); diff --git a/src/monster/monster-dist-offsets.c b/src/monster/monster-dist-offsets.c index 844246dbd..29aedbc67 100644 --- a/src/monster/monster-dist-offsets.c +++ b/src/monster/monster-dist-offsets.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "monster/monster-dist-offsets.h" /* diff --git a/src/monster/monster-move.h b/src/monster/monster-move.h index 862448b5e..78cdfc28c 100644 --- a/src/monster/monster-move.h +++ b/src/monster/monster-move.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, DIRECTION *mm, POSITION oy, POSITION ox, int *count); diff --git a/src/monster/monster-object.h b/src/monster/monster-object.h index 7b4a81481..c94288aa7 100644 --- a/src/monster/monster-object.h +++ b/src/monster/monster-object.h @@ -6,7 +6,7 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" void update_object_by_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx); diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c index 2a79e13b9..07eb8f466 100644 --- a/src/monster/monster-process.c +++ b/src/monster/monster-process.c @@ -13,7 +13,7 @@ * to improve the general quality of the AI (version 0.1.1). */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "monster/monster-direction.h" #include "monster/monster-move.h" diff --git a/src/monster/monster-runaway.h b/src/monster/monster-runaway.h index 24eb8d425..d0adfe39b 100644 --- a/src/monster/monster-runaway.h +++ b/src/monster/monster-runaway.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx); diff --git a/src/monster/monster-safety-hiding.h b/src/monster/monster-safety-hiding.h index f1827ad6f..6b0af99bb 100644 --- a/src/monster/monster-safety-hiding.h +++ b/src/monster/monster-safety-hiding.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" bool find_safety(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSITION *xp); diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c index 6d5623afb..50fa898b8 100644 --- a/src/monster/monster-status.c +++ b/src/monster/monster-status.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/monster/monster-sweep-grid.h b/src/monster/monster-sweep-grid.h index d89a3e230..e8d059ff9 100644 --- a/src/monster/monster-sweep-grid.h +++ b/src/monster/monster-sweep-grid.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm); \ No newline at end of file diff --git a/src/monster/monster-update.h b/src/monster/monster-update.h index 2c83fc9d1..42d61c3bd 100644 --- a/src/monster/monster-update.h +++ b/src/monster/monster-update.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "monster/monster-util.h" bool update_riding_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, POSITION ny, POSITION nx); diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c index 760d4548b..a081832c1 100644 --- a/src/monster/monster-util.c +++ b/src/monster/monster-util.c @@ -7,7 +7,7 @@ * 引数に入っていたらここには移動させないこと */ -#include "angband.h" +#include "system/angband.h" #include "monster-util.h" /*! diff --git a/src/monster/monster1.c b/src/monster/monster1.c index 5e0c0ae64..4e50dcf4b 100644 --- a/src/monster/monster1.c +++ b/src/monster/monster1.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/music-definitions-table.h" #include "gameterm.h" diff --git a/src/monster/monster2.c b/src/monster/monster2.c index d94856cab..5b3008722 100644 --- a/src/monster/monster2.c +++ b/src/monster/monster2.c @@ -10,10 +10,10 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "io/write-diary.h" #include "cmd/cmd-dump.h" diff --git a/src/monster/monsterrace-hook.c b/src/monster/monsterrace-hook.c index 313221dde..25d865154 100644 --- a/src/monster/monsterrace-hook.c +++ b/src/monster/monsterrace-hook.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "monster/monsterrace-hook.h" diff --git a/src/monster/monsterrace.c b/src/monster/monsterrace.c index d0502a3c1..ac2b9cbca 100644 --- a/src/monster/monsterrace.c +++ b/src/monster/monsterrace.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "monster/monsterrace.h" #include "util.h" diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c index 46e70c05e..f9c2284ca 100644 --- a/src/monster/quantum-effect.c +++ b/src/monster/quantum-effect.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "quantum-effect.h" #include "monster-spell.h" #include "spell/spells3.h" diff --git a/src/mspells1.c b/src/mspells1.c index 3182966ad..b00c4ed77 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -38,7 +38,7 @@ * Both of them have the same effect on the "choose spell" routine.\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "effect/effect-characteristics.h" diff --git a/src/mspells2.c b/src/mspells2.c index f663bb7e8..abed7a262 100644 --- a/src/mspells2.c +++ b/src/mspells2.c @@ -11,7 +11,7 @@ * @details */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/mspells3.c b/src/mspells3.c index 07873170d..34e32c9f8 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/mspells4.c b/src/mspells4.c index 070ee0eba..b5941d55f 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -5,7 +5,7 @@ * @author Habu */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c index 27cff7d96..856ed3a58 100644 --- a/src/mutation/mutation-processor.c +++ b/src/mutation/mutation-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "mutation/mutation-processor.h" #include "spell/spells-type.h" #include "spells-summon.h" diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c index 780add40d..dbbccbaf8 100644 --- a/src/mutation/mutation.c +++ b/src/mutation/mutation.c @@ -11,7 +11,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "core/show-file.h" #include "util.h" diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c index 6b3972e4c..bfe760816 100644 --- a/src/object/lite-processor.c +++ b/src/object/lite-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "object/lite-processor.h" #include "object/object-ego.h" #include "object/object-hook.h" diff --git a/src/object/object-boost.c b/src/object/object-boost.c index 17574aadd..dae24f0e1 100644 --- a/src/object/object-boost.c +++ b/src/object/object-boost.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "floor/floor.h" #include "object/object-boost.h" #include "object/object-boost.h" diff --git a/src/object/object-broken.c b/src/object/object-broken.c index fb89e32f8..29692c9b3 100644 --- a/src/object/object-broken.c +++ b/src/object/object-broken.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "object/object-kind.h" #include "snipe.h" #include "spell/spells-type.h" diff --git a/src/object/object-curse.c b/src/object/object-curse.c index b3396e0b7..228845ff8 100644 --- a/src/object/object-curse.c +++ b/src/object/object-curse.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "object/object-flavor.h" diff --git a/src/object/object-ego.c b/src/object/object-ego.c index 3b6df5b95..f8a67fd0e 100644 --- a/src/object/object-ego.c +++ b/src/object/object-ego.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "object/object-ego.h" /* diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c index 78098e8a8..a82385c87 100644 --- a/src/object/object-flavor.c +++ b/src/object/object-flavor.c @@ -10,7 +10,7 @@ * are included in all such copies. Other copyrights may also apply.\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-smith.h" diff --git a/src/object/object-flavor.h b/src/object/object-flavor.h index 399e884f7..c037a07ad 100644 --- a/src/object/object-flavor.h +++ b/src/object/object-flavor.h @@ -1,6 +1,6 @@ #pragma once -#include "h-type.h" +#include "system/h-type.h" #include "object/object.h" /* flavor.c */ diff --git a/src/object/object-hook.c b/src/object/object-hook.c index d14f5e487..898f57029 100644 --- a/src/object/object-hook.c +++ b/src/object/object-hook.c @@ -1,5 +1,5 @@  -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "object/object-hook.h" diff --git a/src/object/object-kind-hook.c b/src/object/object-kind-hook.c index 9f41f15da..9ce206742 100644 --- a/src/object/object-kind-hook.c +++ b/src/object/object-kind-hook.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "object/object-kind-hook.h" #include "object/object-kind.h" diff --git a/src/object/object-kind.c b/src/object/object-kind.c index 6f0018fa6..f6f93b4e4 100644 --- a/src/object/object-kind.c +++ b/src/object/object-kind.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "object-kind.h" diff --git a/src/object/object1.c b/src/object/object1.c index 4667a04b0..0bfedb423 100644 --- a/src/object/object1.c +++ b/src/object/object1.c @@ -11,8 +11,8 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" -#include "core/system-variables.h" +#include "system/angband.h" +#include "system/system-variables.h" #include "io/read-pref-file.h" #include "util.h" diff --git a/src/object/object2.c b/src/object/object2.c index faf1d35d5..60d20f9fa 100644 --- a/src/object/object2.c +++ b/src/object/object2.c @@ -11,7 +11,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" #include "world/world.h" diff --git a/src/patron.c b/src/patron.c index 6bd196295..4b175f8f8 100644 --- a/src/patron.c +++ b/src/patron.c @@ -1,5 +1,5 @@  -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "io/write-diary.h" diff --git a/src/player-inventory.c b/src/player-inventory.c index d2691a09b..df4602947 100644 --- a/src/player-inventory.c +++ b/src/player-inventory.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "player-inventory.h" diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c index 8d258b045..7fd17298e 100644 --- a/src/player/digestion-processor.c +++ b/src/player/digestion-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "player/digestion-processor.h" #include "world/world.h" #include "realm/realm-song.h" diff --git a/src/player/mimic-info-table.c b/src/player/mimic-info-table.c index f10898d10..325a048da 100644 --- a/src/player/mimic-info-table.c +++ b/src/player/mimic-info-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "mimic-info-table.h" /*! diff --git a/src/player/permanent-resistances.h b/src/player/permanent-resistances.h index ace81f63e..89f692ab7 100644 --- a/src/player/permanent-resistances.h +++ b/src/player/permanent-resistances.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void player_flags(player_type *creature_ptr, BIT_FLAGS *flags); diff --git a/src/player/player-class.c b/src/player/player-class.c index c5d7f19de..2e2750451 100644 --- a/src/player/player-class.c +++ b/src/player/player-class.c @@ -1,5 +1,5 @@  -#include "angband.h" +#include "system/angband.h" #include "player/player-class.h" /* diff --git a/src/player/player-damage.c b/src/player/player-damage.c index 3b1ec6f53..b3116c289 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/music-definitions-table.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index 2e01c7c08..759031c7b 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -12,7 +12,7 @@ * 2013 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "gameterm.h" #include "core/stuff-handler.h" #include "util.h" diff --git a/src/player/player-move.c b/src/player/player-move.c index 8103e15b4..f33edef35 100644 --- a/src/player/player-move.c +++ b/src/player/player-move.c @@ -139,7 +139,7 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "core/special-internal-keys.h" #include "util.h" diff --git a/src/player/player-personality.c b/src/player/player-personality.c index 727485935..4a25e5148 100644 --- a/src/player/player-personality.c +++ b/src/player/player-personality.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "player/player-personality.h" diff --git a/src/player/player-race.c b/src/player/player-race.c index 80db024f7..bd760c6d0 100644 --- a/src/player/player-race.c +++ b/src/player/player-race.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "player/player-race.h" const player_race *rp_ptr; diff --git a/src/player/player-sex.c b/src/player/player-sex.c index 6de935577..e7ceccf7e 100644 --- a/src/player/player-sex.c +++ b/src/player/player-sex.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "player/player-sex.h" /* diff --git a/src/player/player-skill.c b/src/player/player-skill.c index d95d6bf69..1e2e6286f 100644 --- a/src/player/player-skill.c +++ b/src/player/player-skill.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "player/player-skill.h" /* diff --git a/src/player/player-status.c b/src/player/player-status.c index 1664aa062..fa3925547 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/player/process-death.h b/src/player/process-death.h index d1d7d65e5..612fd1b86 100644 --- a/src/player/process-death.h +++ b/src/player/process-death.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "files.h" void print_tomb(player_type *dead_ptr); diff --git a/src/player/process-name.h b/src/player/process-name.h index d37d7d3a3..6e5d4bc7e 100644 --- a/src/player/process-name.h +++ b/src/player/process-name.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void process_player_name(player_type *creature_ptr, bool sf); void get_name(player_type *creature_ptr); diff --git a/src/player/race-info-table.c b/src/player/race-info-table.c index a52593d21..b5237c0d1 100644 --- a/src/player/race-info-table.c +++ b/src/player/race-info-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "race-info-table.h" /*! diff --git a/src/player/race-resistances.h b/src/player/race-resistances.h index e43e564f5..971580b92 100644 --- a/src/player/race-resistances.h +++ b/src/player/race-resistances.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void player_immunity(player_type *creature_ptr, BIT_FLAGS *flags); void tim_player_immunity(player_type *creature_ptr, BIT_FLAGS *flags); diff --git a/src/player/temporary-resistances.h b/src/player/temporary-resistances.h index 073ddcd7a..5f5506eff 100644 --- a/src/player/temporary-resistances.h +++ b/src/player/temporary-resistances.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void tim_player_flags(player_type *creature_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]); diff --git a/src/quest.c b/src/quest.c index 3cb266afa..f510d9ca2 100644 --- a/src/quest.c +++ b/src/quest.c @@ -1,8 +1,8 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/music-definitions-table.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "dungeon/dungeon.h" #include "floor/floor.h" #include "floor/floor-save.h" diff --git a/src/racial.c b/src/racial.c index 1a0e34224..40ec42135 100644 --- a/src/racial.c +++ b/src/racial.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen. \n */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c index 1cdd7c490..0cabde6b5 100644 --- a/src/realm/realm-arcane.c +++ b/src/realm/realm-arcane.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c index 9d103ae37..93342f63d 100644 --- a/src/realm/realm-chaos.c +++ b/src/realm/realm-chaos.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c index d4b7adcd5..8fac0929a 100644 --- a/src/realm/realm-craft.c +++ b/src/realm/realm-craft.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c index 39c899a00..3b4967faa 100644 --- a/src/realm/realm-crusade.c +++ b/src/realm/realm-crusade.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "world/world.h" diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c index b6e4c8805..652059d8f 100644 --- a/src/realm/realm-daemon.c +++ b/src/realm/realm-daemon.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "player/player-class.h" diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c index da2d763af..e7a0e5e0a 100644 --- a/src/realm/realm-death.c +++ b/src/realm/realm-death.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd-spell.h" #include "spell/spells-type.h" #include "spells-summon.h" diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c index e7cb402ab..4651bcba6 100644 --- a/src/realm/realm-hex.c +++ b/src/realm/realm-hex.c @@ -15,7 +15,7 @@ * 2: Turn count for revenge\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "effect/effect-characteristics.h" diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c index e7f9e4242..90edb248c 100644 --- a/src/realm/realm-hissatsu.c +++ b/src/realm/realm-hissatsu.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c index 8525bc43e..e9dd73d58 100644 --- a/src/realm/realm-life.c +++ b/src/realm/realm-life.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "cmd-spell.h" #include "spells-status.h" #include "spells-floor.h" diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c index 5bd461a8e..5a11c0673 100644 --- a/src/realm/realm-nature.c +++ b/src/realm/realm-nature.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c index 8aae046ba..a9382aafd 100644 --- a/src/realm/realm-song.c +++ b/src/realm/realm-song.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c index 159a9fa70..2b1e11688 100644 --- a/src/realm/realm-sorcery.c +++ b/src/realm/realm-sorcery.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c index 506cd6ea3..3c6da86e3 100644 --- a/src/realm/realm-trump.c +++ b/src/realm/realm-trump.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-spell.h" diff --git a/src/realm/realm.c b/src/realm/realm.c index 1e070ff2a..4d3d78f78 100644 --- a/src/realm/realm.c +++ b/src/realm/realm.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "realm/realm.h" #ifdef JP diff --git a/src/report.c b/src/report.c index 3d454931e..7ecb44ac2 100644 --- a/src/report.c +++ b/src/report.c @@ -5,7 +5,7 @@ * @author Hengband Team */ -#include "angband.h" +#include "system/angband.h" #include "core/turn-compensator.h" #include "core/angband-version.h" #include "core/stuff-handler.h" diff --git a/src/room/pit-nest-kinds-table.c b/src/room/pit-nest-kinds-table.c index 0c3f182de..500b28a66 100644 --- a/src/room/pit-nest-kinds-table.c +++ b/src/room/pit-nest-kinds-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "room/pit-nest-kinds-table.h" #include "monster/monsterrace-hook.h" diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c index 372b7fc94..cebfc2995 100644 --- a/src/room/rooms-city.c +++ b/src/room/rooms-city.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "grid.h" diff --git a/src/room/rooms-fractal.c b/src/room/rooms-fractal.c index 73682ea9e..eec6a4d79 100644 --- a/src/room/rooms-fractal.c +++ b/src/room/rooms-fractal.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "grid.h" #include "floor/floor-generate.h" #include "room/rooms.h" diff --git a/src/room/rooms-normal.c b/src/room/rooms-normal.c index 764a5dfd8..b77d5282a 100644 --- a/src/room/rooms-normal.c +++ b/src/room/rooms-normal.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "grid.h" #include "trap.h" diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c index ee27a8eb3..3733821cb 100644 --- a/src/room/rooms-pit-nest.c +++ b/src/room/rooms-pit-nest.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "grid.h" diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c index 7eabb801b..366fc975c 100644 --- a/src/room/rooms-special.c +++ b/src/room/rooms-special.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "grid.h" diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c index 59aa8ff9d..79e7c7bcf 100644 --- a/src/room/rooms-trap.c +++ b/src/room/rooms-trap.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "grid.h" diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c index 25f665121..9c721bea6 100644 --- a/src/room/rooms-vault.c +++ b/src/room/rooms-vault.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "room/rooms-vault.h" diff --git a/src/room/rooms.c b/src/room/rooms.c index 0639fd476..bb1a51510 100644 --- a/src/room/rooms.c +++ b/src/room/rooms.c @@ -36,7 +36,7 @@ * None of the pits/nests are allowed to include "unique" monsters.\n */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "feature.h" diff --git a/src/rumor.c b/src/rumor.c index 5c5803149..0b88c6947 100644 --- a/src/rumor.c +++ b/src/rumor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "io/tokenizer.h" diff --git a/src/save.c b/src/save.c index 672f32d21..796d63b00 100644 --- a/src/save.c +++ b/src/save.c @@ -11,7 +11,7 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "save.h" #include "load.h" diff --git a/src/scores.c b/src/scores.c index 4f47494dc..2e5022e47 100644 --- a/src/scores.c +++ b/src/scores.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "io/signal-handlers.h" #include "gameterm.h" #include "util.h" diff --git a/src/selfinfo.c b/src/selfinfo.c index 37f8770e6..d64ca00fa 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -14,7 +14,7 @@ * spell2s.cから分離 */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "player/player-status.h" diff --git a/src/snipe.c b/src/snipe.c index c1ceda4ae..6a84a83b7 100644 --- a/src/snipe.c +++ b/src/snipe.c @@ -6,7 +6,7 @@ * 2014 Deskull rearranged comment for Doxygen.\n */ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/sort.c b/src/sort.c index 86bca5ec2..de557c71a 100644 --- a/src/sort.c +++ b/src/sort.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "sort.h" #include "floor/floor.h" #include "quest.h" diff --git a/src/spell/music-checker.c b/src/spell/music-checker.c index 9453e8bed..84d0b5e5a 100644 --- a/src/spell/music-checker.c +++ b/src/spell/music-checker.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "spell/music-checker.h" #include "realm/realm-song.h" #include "spell/spells3.h" diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c index 63f70559f..b4d2f42c2 100644 --- a/src/spell/process-effect.c +++ b/src/spell/process-effect.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "effect/spells-effect-util.h" #include "spell/process-effect.h" #include "cmd-pet.h" // 暫定、後で消すかも. diff --git a/src/spell/spells-execution.c b/src/spell/spells-execution.c index 11c987dde..954153284 100644 --- a/src/spell/spells-execution.c +++ b/src/spell/spells-execution.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "spell/spells-util.h" #include "spell/spells-execution.h" #include "realm/realm.h" diff --git a/src/spell/spells1.c b/src/spell/spells1.c index 04b33497a..d9ff8ae80 100644 --- a/src/spell/spells1.c +++ b/src/spell/spells1.c @@ -11,8 +11,8 @@ * */ -#include "angband.h" -#include "core/system-variables.h" +#include "system/angband.h" +#include "system/system-variables.h" #include "util.h" #include "main/sound-definitions-table.h" #include "cmd/cmd-pet.h" diff --git a/src/spell/spells2.c b/src/spell/spells2.c index ba7687276..fa620435f 100644 --- a/src/spell/spells2.c +++ b/src/spell/spells2.c @@ -11,8 +11,8 @@ * */ -#include "angband.h" -#include "core/system-variables.h" +#include "system/angband.h" +#include "system/system-variables.h" #include "core/stuff-handler.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/spell/spells3.c b/src/spell/spells3.c index dff65b24f..0df53094a 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -11,7 +11,7 @@ * */ -#include "angband.h" +#include "system/angband.h" #include "market/building.h" #include "core/stuff-handler.h" #include "gameterm.h" diff --git a/src/spell/technic-info-table.c b/src/spell/technic-info-table.c index f09816174..5ae24b045 100644 --- a/src/spell/technic-info-table.c +++ b/src/spell/technic-info-table.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "spell/technic-info-table.h" /*! diff --git a/src/spells-diceroll.c b/src/spells-diceroll.c index c35a341e3..f563edfac 100644 --- a/src/spells-diceroll.c +++ b/src/spells-diceroll.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "spells-diceroll.h" diff --git a/src/spells-floor.c b/src/spells-floor.c index a406c0301..f21bd82df 100644 --- a/src/spells-floor.c +++ b/src/spells-floor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "dungeon/dungeon.h" diff --git a/src/spells-object.c b/src/spells-object.c index 11ecc9e4e..f4af8f9f1 100644 --- a/src/spells-object.c +++ b/src/spells-object.c @@ -1,5 +1,5 @@  -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "cmd-basic.h" diff --git a/src/spells-status.c b/src/spells-status.c index 1a7ed61c1..1ff0a0ea3 100644 --- a/src/spells-status.c +++ b/src/spells-status.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "core/stuff-handler.h" #include "util.h" diff --git a/src/spells-summon.c b/src/spells-summon.c index 3cdff10fc..ec112671f 100644 --- a/src/spells-summon.c +++ b/src/spells-summon.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "spells-summon.h" diff --git a/src/spells-world.c b/src/spells-world.c index b4cb6f32d..8f8792a9d 100644 --- a/src/spells-world.c +++ b/src/spells-world.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "world/world.h" diff --git a/src/angband.h b/src/system/angband.h similarity index 100% rename from src/angband.h rename to src/system/angband.h diff --git a/src/h-basic.h b/src/system/h-basic.h similarity index 88% rename from src/h-basic.h rename to src/system/h-basic.h index 231b0e4b4..63b0ec7ca 100644 --- a/src/h-basic.h +++ b/src/system/h-basic.h @@ -15,16 +15,16 @@ #endif /* HAVE_CONFIG_H */ /* System Configuration */ -#include "h-config.h" +#include "system/h-config.h" /* System includes/externs */ -#include "h-system.h" +#include "system/h-system.h" /* Basic types */ -#include "h-type.h" +#include "system/h-type.h" /* Basic constants and macros */ -#include "h-define.h" +#include "system/h-define.h" /* ゲーム調整値はこちらに */ #include "gamevalue.h" diff --git a/src/h-config.h b/src/system/h-config.h similarity index 100% rename from src/h-config.h rename to src/system/h-config.h diff --git a/src/h-define.h b/src/system/h-define.h similarity index 100% rename from src/h-define.h rename to src/system/h-define.h diff --git a/src/h-system.h b/src/system/h-system.h similarity index 100% rename from src/h-system.h rename to src/system/h-system.h diff --git a/src/h-type.h b/src/system/h-type.h similarity index 100% rename from src/h-type.h rename to src/system/h-type.h diff --git a/src/core/system-variables.c b/src/system/system-variables.c similarity index 92% rename from src/core/system-variables.c rename to src/system/system-variables.c index 5869d1b81..a9dd70bfd 100644 --- a/src/core/system-variables.c +++ b/src/system/system-variables.c @@ -4,8 +4,8 @@ * @date 2013/12/31 */ -#include "angband.h" -#include "core/system-variables.h" +#include "system/angband.h" +#include "system/system-variables.h" /*! * todo どこからも呼ばれていない。main関数辺りに移設するか、そもそもコメントでいいと思われる diff --git a/src/core/system-variables.h b/src/system/system-variables.h similarity index 100% rename from src/core/system-variables.h rename to src/system/system-variables.h diff --git a/src/targeting.c b/src/targeting.c index 164f434c0..06c8217cc 100644 --- a/src/targeting.c +++ b/src/targeting.c @@ -10,9 +10,9 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/stuff-handler.h" #include "gameterm.h" #include "targeting.h" diff --git a/src/trap.c b/src/trap.c index ce11569f3..34febfc77 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "main/sound-definitions-table.h" diff --git a/src/util.c b/src/util.c index ca97f7d93..8aeb6d3e6 100644 --- a/src/util.c +++ b/src/util.c @@ -10,10 +10,10 @@ /* Purpose: Angband utilities -BEN- */ -#include "angband.h" +#include "system/angband.h" #include "main/music-definitions-table.h" #include "io/signal-handlers.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/stuff-handler.h" #include "gameterm.h" #include "util.h" diff --git a/src/view/display-characteristic.h b/src/view/display-characteristic.h index d662de2f9..1fee1e8d8 100644 --- a/src/view/display-characteristic.h +++ b/src/view/display-characteristic.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" /* Mode flags for displaying player flags */ #define DP_CURSE 0x01 diff --git a/src/view/display-fruit.c b/src/view/display-fruit.c index 720a86226..34ac161b5 100644 --- a/src/view/display-fruit.c +++ b/src/view/display-fruit.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "display-fruit.h" #include "gameterm.h" diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c index d4afba2a6..fb8416df1 100644 --- a/src/view/display-main-window.c +++ b/src/view/display-main-window.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "autopick/autopick-finder.h" #include "autopick/autopick-methods-table.h" @@ -18,7 +18,7 @@ #include "gameterm.h" #include "market/building.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "core/stuff-handler.h" #include "files.h" #include "world/world.h" diff --git a/src/view/display-player-middle.h b/src/view/display-player-middle.h index 4de5108cc..024577990 100644 --- a/src/view/display-player-middle.h +++ b/src/view/display-player-middle.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void display_player_middle(player_type *creature_ptr); diff --git a/src/view/display-player-misc-info.c b/src/view/display-player-misc-info.c index 1a3ffe615..d4ecffa33 100644 --- a/src/view/display-player-misc-info.c +++ b/src/view/display-player-misc-info.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "view/display-player-stat-info.h" #include "player/mimic-info-table.h" #include "player/player-personality.h" diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c index 8b229ded8..8167681b4 100644 --- a/src/view/display-player-stat-info.c +++ b/src/view/display-player-stat-info.c @@ -6,7 +6,7 @@ * ここにこれ以上関数を引っ越してくるのは禁止。何ならここから更に分割していく */ -#include "angband.h" +#include "system/angband.h" #include "display-player-stat-info.h" #include "player/mimic-info-table.h" #include "gameterm.h" diff --git a/src/view/display-player.c b/src/view/display-player.c index 91e2998f0..fd5f69a8d 100644 --- a/src/view/display-player.c +++ b/src/view/display-player.c @@ -15,7 +15,7 @@ #include "patron.h" #include "world/world.h" #include "quest.h" -#include "core/system-variables.h" // 暫定。後で消す +#include "system/system-variables.h" // 暫定。後で消す #include "knowledge/knowledge-mutations.h" #include "dungeon/dungeon-file.h" #include "object/object-kind.h" diff --git a/src/view/display-player.h b/src/view/display-player.h index be5290913..eec23a04e 100644 --- a/src/view/display-player.h +++ b/src/view/display-player.h @@ -1,6 +1,6 @@ #pragma once -#include "angband.h" +#include "system/angband.h" #include "files.h" void display_player(player_type *creature_ptr, int mode, map_name_pf map_name); diff --git a/src/view/display-util.h b/src/view/display-util.h index 62223b239..900858755 100644 --- a/src/view/display-util.h +++ b/src/view/display-util.h @@ -1,5 +1,5 @@ #pragma once -#include "angband.h" +#include "system/angband.h" void display_player_one_line(int entry, concptr val, TERM_COLOR attr); diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c index d137488f5..d9b11547c 100644 --- a/src/view/status-first-page.c +++ b/src/view/status-first-page.c @@ -5,7 +5,7 @@ * @author Hourier */ -#include "angband.h" +#include "system/angband.h" #include "gameterm.h" #include "status-first-page.h" #include "display-util.h" diff --git a/src/warning.c b/src/warning.c index 203a28063..4fbb339e6 100644 --- a/src/warning.c +++ b/src/warning.c @@ -1,5 +1,5 @@  -#include "angband.h" +#include "system/angband.h" #include "util.h" #include "artifact.h" diff --git a/src/wild.c b/src/wild.c index a29ebde5f..e26e5b016 100644 --- a/src/wild.c +++ b/src/wild.c @@ -10,9 +10,9 @@ * 2013 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "util.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "dungeon/dungeon.h" #include "floor/floor.h" diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index 79cae6c9d..cd2629a42 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -10,7 +10,7 @@ * 2014 Deskull rearranged comment for Doxygen.
*/ -#include "angband.h" +#include "system/angband.h" #include "wizard/wizard-special-process.h" #include "wizard/wizard-spoiler.h" #include "core/angband-version.h" diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c index ee444fcca..36efd950b 100644 --- a/src/wizard/wizard-spoiler.c +++ b/src/wizard/wizard-spoiler.c @@ -10,7 +10,7 @@ * 2013 Deskull rearranged comment for Doxygen. */ -#include "angband.h" +#include "system/angband.h" #include "wizard/wizard-spoiler.h" #include "util.h" #include "gameterm.h" diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c index 2fd73ca48..48e29119f 100644 --- a/src/world/world-movement-processor.c +++ b/src/world/world-movement-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "world/world-movement-processor.h" #include "main/sound-definitions-table.h" #include "io/write-diary.h" diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c index 69332b870..48655622a 100644 --- a/src/world/world-turn-processor.c +++ b/src/world/world-turn-processor.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "world/world-turn-processor.h" #include "world/world.h" #include "dungeon/dungeon.h" diff --git a/src/world/world.c b/src/world/world.c index 1ee5edb45..d3b30afc2 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -1,4 +1,4 @@ -#include "angband.h" +#include "system/angband.h" #include "world/world.h" #include "player/player-race.h" diff --git a/src/z-form.h b/src/z-form.h index 5fc818cb1..7864bc8c2 100644 --- a/src/z-form.h +++ b/src/z-form.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_Z_FORM_H #define INCLUDED_Z_FORM_H -#include "h-basic.h" +#include "system/h-basic.h" /* * This file provides functions very similar to "sprintf()", but which diff --git a/src/z-rand.h b/src/z-rand.h index d194a68fa..c679bdee2 100644 --- a/src/z-rand.h +++ b/src/z-rand.h @@ -12,7 +12,7 @@ #ifndef INCLUDED_Z_RAND_H #define INCLUDED_Z_RAND_H -#include "h-basic.h" +#include "system/h-basic.h" diff --git a/src/z-term.c b/src/z-term.c index 149337e88..884a33627 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -9,7 +9,7 @@ */ /* Purpose: a generic, efficient, terminal window package -BEN- */ -#include "angband.h" +#include "system/angband.h" #include "gameterm.h" #include "z-term.h" diff --git a/src/z-term.h b/src/z-term.h index db5f882d3..9acf10717 100644 --- a/src/z-term.h +++ b/src/z-term.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_Z_TERM_H #define INCLUDED_Z_TERM_H -#include "h-basic.h" +#include "system/h-basic.h" typedef struct term_win term_win; /*! diff --git a/src/z-util.h b/src/z-util.h index cba4163b1..07bdab5fa 100644 --- a/src/z-util.h +++ b/src/z-util.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_Z_UTIL_H #define INCLUDED_Z_UTIL_H -#include "h-basic.h" +#include "system/h-basic.h" /* diff --git a/src/z-virt.h b/src/z-virt.h index 206473516..3fb9f28be 100644 --- a/src/z-virt.h +++ b/src/z-virt.h @@ -11,7 +11,7 @@ #ifndef INCLUDED_Z_VIRT_H #define INCLUDED_Z_VIRT_H -#include "h-basic.h" +#include "system/h-basic.h" /* * Memory management routines. -- 2.11.0