From 619447a8f2f3cad00ebfee5b327be1dd3da5aef6 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 10 May 2020 22:20:09 +0900 Subject: [PATCH] [Refactor] #39970 Moved world.c/h to world/ --- Hengband/Hengband/Hengband.vcxproj | 4 ++-- Hengband/Hengband/Hengband.vcxproj.filters | 24 ++++++++++++------------ src/Makefile.am | 3 ++- src/artifact.c | 2 +- src/birth/birth.c | 2 +- src/character-dump.c | 2 +- src/cmd/cmd-activate.c | 2 +- src/cmd/cmd-autopick.c | 2 +- src/cmd/cmd-basic.c | 2 +- src/cmd/cmd-diary.c | 2 +- src/cmd/cmd-dump.c | 2 +- src/cmd/cmd-gameoption.c | 2 +- src/cmd/cmd-inn.c | 2 +- src/cmd/cmd-pet.c | 2 +- src/cmd/cmd-save.c | 2 +- src/combat/melee.c | 2 +- src/core.c | 2 +- src/core/game-closer.c | 2 +- src/core/hp-mp-processor.c | 2 +- src/core/turn-compensator.c | 2 +- src/dungeon-file.c | 2 +- src/dungeon.c | 2 +- src/effect/effect-feature.c | 2 +- src/effect/effect-monster-psi.c | 2 +- src/effect/effect-player-curse.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/floor-events.c | 2 +- src/floor-generate.c | 2 +- src/floor-save.c | 2 +- src/floor.c | 2 +- src/grid.c | 2 +- src/init.c | 2 +- src/io/exit-panic.c | 2 +- src/io/input-key-processor.c | 2 +- src/io/interpret-pref-file.c | 2 +- src/io/read-pref-file.c | 2 +- src/io/signal-handlers.c | 2 +- src/io/write-diary.c | 2 +- src/knowledge/knowledge-features.c | 2 +- src/knowledge/knowledge-items.c | 2 +- src/knowledge/knowledge-monsters.c | 2 +- src/knowledge/knowledge-quests.c | 2 +- src/knowledge/knowledge-self.c | 2 +- src/load.c | 2 +- src/main-win.c | 2 +- src/market/building.c | 2 +- src/market/store.c | 2 +- src/monster-status.c | 2 +- src/monster1.c | 2 +- src/monster2.c | 2 +- src/mspells1.c | 2 +- src/mspells2.c | 2 +- src/mspells4.c | 2 +- src/object-flavor.c | 2 +- src/object-hook.c | 2 +- src/object/lite-processor.c | 2 +- src/object2.c | 2 +- src/player-damage.c | 2 +- src/player-effects.c | 2 +- src/player-move.c | 2 +- src/player-status.c | 2 +- src/player/digestion-processor.c | 2 +- src/player/process-death.c | 2 +- src/player/process-name.c | 2 +- src/quest.c | 2 +- src/realm/realm-crusade.c | 2 +- src/realm/realm-hex.c | 2 +- src/realm/realm-hissatsu.c | 2 +- src/report.c | 2 +- src/rumor.c | 2 +- src/save.c | 2 +- src/scores.c | 2 +- src/spell/spells2.c | 2 +- src/spell/spells3.c | 2 +- src/spells-world.c | 2 +- src/targeting.c | 2 +- src/trap.c | 2 +- src/util.c | 2 +- src/view/display-main-window.c | 2 +- src/view/display-player-middle.c | 2 +- src/view/display-player.c | 2 +- src/wild.c | 2 +- src/wizard/wizard-special-process.c | 2 +- src/world/world-movement-processor.c | 2 +- src/world/world-turn-processor.c | 2 +- src/{ => world}/world.c | 2 +- src/{ => world}/world.h | 0 89 files changed, 101 insertions(+), 100 deletions(-) rename src/{ => world}/world.c (98%) rename src/{ => world}/world.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 9f5aa05a8..9d068ca62 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -511,7 +511,7 @@ - + @@ -718,7 +718,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 8e8b93dcf..c18e884fc 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -196,12 +196,6 @@ io - - floor - - - floor - market @@ -823,6 +817,12 @@ world + + floor + + + world + @@ -1007,12 +1007,6 @@ io - - floor - - - floor - market @@ -1679,6 +1673,12 @@ world + + floor + + + world + diff --git a/src/Makefile.am b/src/Makefile.am index eddc8af27..e1283a0df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -227,7 +227,7 @@ hengband_SOURCES = \ spells-world.c spells-world.h \ \ sort.c sort.h gameterm.c gameterm.h trap.c trap.h util.c util.h \ - wild.h wild.c warning.c warning.h world.c world.h \ + wild.h wild.c warning.c warning.h \ \ view-mainwindow.c view-mainwindow.h targeting.c targeting.h \ \ @@ -271,6 +271,7 @@ hengband_SOURCES = \ wizard/wizard-spoiler.c wizard/wizard-spoiler.h\ wizard/wizard-special-process.c wizard/wizard-special-process.h \ \ + 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 \ diff --git a/src/artifact.c b/src/artifact.c index 460df45c8..134f31bfd 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -33,7 +33,7 @@ #include "view/display-main-window.h" #include "player-class.h" #include "player-personality.h" -#include "world.h" +#include "world/world.h" /* * The artifact arrays diff --git a/src/birth/birth.c b/src/birth/birth.c index 21c03bc9f..3ed80ef61 100644 --- a/src/birth/birth.c +++ b/src/birth/birth.c @@ -58,7 +58,7 @@ #include "view/display-main-window.h" // 暫定。後で消す. #include "view/display-player.h" // 暫定。後で消す. #include "wild.h" -#include "world.h" +#include "world/world.h" /* * The last character rolled, diff --git a/src/character-dump.c b/src/character-dump.c index 8eff3bdf3..8dda0a953 100644 --- a/src/character-dump.c +++ b/src/character-dump.c @@ -1,6 +1,6 @@ #include "character-dump.h" #include "core/angband-version.h" -#include "world.h" +#include "world/world.h" #include "floor-town.h" #include "dungeon.h" #include "market/store.h" diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c index ea812e17c..7b0de6f2f 100644 --- a/src/cmd/cmd-activate.c +++ b/src/cmd/cmd-activate.c @@ -29,7 +29,7 @@ #include "object/object-kind.h" #include "object-ego.h" #include "targeting.h" -#include "world.h" +#include "world/world.h" #include "effect/spells-effect-util.h" #include "spell/spells-type.h" #include "spell/process-effect.h" diff --git a/src/cmd/cmd-autopick.c b/src/cmd/cmd-autopick.c index 5f84f3fd4..2105d581c 100644 --- a/src/cmd/cmd-autopick.c +++ b/src/cmd/cmd-autopick.c @@ -14,7 +14,7 @@ #include "autopick/autopick-inserter-killer.h" #include "autopick/autopick-pref-processor.h" #include "io/read-pref-file.h" -#include "world.h" +#include "world/world.h" #include "view/display-main-window.h" // 暫定。後で消す. /* diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index e4b9658bc..8154def5b 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -50,7 +50,7 @@ #include "view/display-main-window.h" #include "targeting.h" -#include "world.h" +#include "world/world.h" #include "effect/spells-effect-util.h" #include "spell/spells3.h" #include "core/output-updater.h" diff --git a/src/cmd/cmd-diary.c b/src/cmd/cmd-diary.c index 06a04e390..92e0046f0 100644 --- a/src/cmd/cmd-diary.c +++ b/src/cmd/cmd-diary.c @@ -6,7 +6,7 @@ #include "cmd/diary-subtitle-table.h" #include "player-personality.h" #include "io/write-diary.h" -#include "world.h" +#include "world/world.h" /*! * @brief 日記のタイトル表記と内容出力 diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 810414cf6..cdcfe3fe6 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -39,7 +39,7 @@ #include "io/read-pref-file.h" #include "io/interpret-pref-file.h" -#include "world.h" +#include "world/world.h" #include "view/display-player.h" // 暫定。後で消す. #include "player-personality.h" #include "quest.h" diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 3d390ae2c..0cffe6ae7 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -10,7 +10,7 @@ #include "core/show-file.h" #include "files.h" -#include "world.h" +#include "world/world.h" /* * Software options (set via the '=' command). diff --git a/src/cmd/cmd-inn.c b/src/cmd/cmd-inn.c index 077afda7f..fc2fccc83 100644 --- a/src/cmd/cmd-inn.c +++ b/src/cmd/cmd-inn.c @@ -2,7 +2,7 @@ #include "cmd/cmd-inn.h" #include "cmd/cmd-magiceat.h" #include "io/write-diary.h" -#include "world.h" +#include "world/world.h" #include "player-effects.h" #include "core/turn-compensator.h" #include "rumor.h" diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c index 9fb51e4e3..74afefff1 100644 --- a/src/cmd/cmd-pet.c +++ b/src/cmd/cmd-pet.c @@ -21,7 +21,7 @@ #include "cmd-basic.h" #include "view/display-main-window.h" #include "targeting.h" -#include "world.h" +#include "world/world.h" #include "effect/spells-effect-util.h" int total_friends = 0; diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c index 745671f35..1d4c1b960 100644 --- a/src/cmd/cmd-save.c +++ b/src/cmd/cmd-save.c @@ -5,7 +5,7 @@ #include "player-move.h" #include "core/stuff-handler.h" #include "save.h" -#include "world.h" +#include "world/world.h" #include "monster-status.h" // 違和感。要調査. #include "gameterm.h" diff --git a/src/combat/melee.c b/src/combat/melee.c index f45ca3ec9..3a7b318f3 100644 --- a/src/combat/melee.c +++ b/src/combat/melee.c @@ -44,7 +44,7 @@ #include "player-class.h" #include "player-personality.h" #include "view/display-main-window.h" -#include "world.h" +#include "world/world.h" #include "spells-floor.h" #include "spell/spells2.h" #include "spell/spells3.h" diff --git a/src/core.c b/src/core.c index d75990a86..81b187bd4 100644 --- a/src/core.c +++ b/src/core.c @@ -32,7 +32,7 @@ #include "market/store.h" #include "spell/technic-info-table.h" #include "spells-status.h" -#include "world.h" +#include "world/world.h" #include "market/arena-info-table.h" #include "market/store-util.h" #include "quest.h" diff --git a/src/core/game-closer.c b/src/core/game-closer.c index 499bd5d60..9b624d102 100644 --- a/src/core/game-closer.c +++ b/src/core/game-closer.c @@ -10,7 +10,7 @@ #include "scores.h" #include "view/display-main-window.h" #include "view/display-player.h" -#include "world.h" +#include "world/world.h" static void clear_floor(player_type* player_ptr) { diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c index be94e169e..b52593cbf 100644 --- a/src/core/hp-mp-processor.c +++ b/src/core/hp-mp-processor.c @@ -4,7 +4,7 @@ #include "player-damage.h" #include "object-flavor.h" #include "object-ego.h" -#include "world.h" +#include "world/world.h" #include "player-effects.h" #include "floor/pattern-walk.h" #include "core/hp-mp-regenerator.h" diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c index 93efdddd3..23f5e5025 100644 --- a/src/core/turn-compensator.c +++ b/src/core/turn-compensator.c @@ -1,6 +1,6 @@ #include "angband.h" #include "core/turn-compensator.h" -#include "world.h" +#include "world/world.h" #include "floor-town.h" #include "market/store-owners.h" #include "market/store-util.h" diff --git a/src/dungeon-file.c b/src/dungeon-file.c index 8fd5c8358..345dbbcd8 100644 --- a/src/dungeon-file.c +++ b/src/dungeon-file.c @@ -49,7 +49,7 @@ #include "dungeon.h" #include "floor.h" #include "market/building.h" -#include "world.h" +#include "world/world.h" #include "rooms-vault.h" #include "object/object-kind.h" #include "object-ego.h" diff --git a/src/dungeon.c b/src/dungeon.c index 3eb84edaa..c7a65adf0 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -1,6 +1,6 @@ #include "angband.h" #include "dungeon.h" -#include "world.h" +#include "world/world.h" /* * The dungeon arrays diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c index f1d30ab31..454cb9249 100644 --- a/src/effect/effect-feature.c +++ b/src/effect/effect-feature.c @@ -5,7 +5,7 @@ #include "main/sound-definitions-table.h" #include "trap.h" #include "player-effects.h" -#include "world.h" +#include "world/world.h" #include "spell/spells-type.h" #include "spell/process-effect.h" // 暫定、後で消す. #include "effect/effect-characteristics.h" diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c index 79a0ac466..abc633e82 100644 --- a/src/effect/effect-monster-psi.c +++ b/src/effect/effect-monster-psi.c @@ -2,7 +2,7 @@ #include "effect/effect-monster-util.h" #include "effect/effect-monster-psi.h" #include "player-damage.h" -#include "world.h" +#include "world/world.h" #include "player-effects.h" static bool effect_monster_psi_empty_mind(player_type *caster_ptr, effect_monster_type *em_ptr) diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c index b6bdcfe21..e0cad2c32 100644 --- a/src/effect/effect-player-curse.c +++ b/src/effect/effect-player-curse.c @@ -2,7 +2,7 @@ #include "effect/effect-player-util.h" #include "effect/effect-player-curse.h" #include "player-damage.h" -#include "world.h" +#include "world/world.h" #include "monster-spell.h" #include "object-curse.h" #include "player-effects.h" diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c index 682e6d6d6..3939cd1dc 100644 --- a/src/effect/effect-player-resist-hurt.c +++ b/src/effect/effect-player-resist-hurt.c @@ -2,7 +2,7 @@ #include "effect/effect-player-util.h" #include "effect/effect-player-resist-hurt.h" #include "player-damage.h" -#include "world.h" +#include "world/world.h" #include "object-broken.h" #include "artifact.h" #include "player-effects.h" diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c index d5698edcd..1304e3a16 100644 --- a/src/effect/effect-player-spirit.c +++ b/src/effect/effect-player-spirit.c @@ -4,7 +4,7 @@ #include "monster-spell.h" #include "player-damage.h" #include "player-effects.h" -#include "world.h" +#include "world/world.h" void effect_player_drain_mana(player_type *target_ptr, effect_player_type *ep_ptr) { diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c index 339087bee..84280852d 100644 --- a/src/effect/effect-player-switcher.c +++ b/src/effect/effect-player-switcher.c @@ -12,7 +12,7 @@ #include "player-effects.h" #include "player/mimic-info-table.h" #include "spell/spells-type.h" -#include "world.h" +#include "world/world.h" void effect_player_mana(player_type *target_ptr, effect_player_type *ep_ptr) { if (target_ptr->blind) diff --git a/src/floor-events.c b/src/floor-events.c index 4a2039fd7..a73a69bb8 100644 --- a/src/floor-events.c +++ b/src/floor-events.c @@ -10,7 +10,7 @@ #include "quest.h" #include "object-hook.h" #include "player-move.h" -#include "world.h" +#include "world/world.h" #include "player-effects.h" #include "object/object-kind.h" #include "object-ego.h" diff --git a/src/floor-generate.c b/src/floor-generate.c index 39880d49a..1869d76b7 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -125,7 +125,7 @@ #include "feature.h" #include "spell/spells1.h" -#include "world.h" +#include "world/world.h" #include "view/display-main-window.h" int dun_tun_rnd; diff --git a/src/floor-save.c b/src/floor-save.c index a2054e013..45dd4bb2c 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -38,7 +38,7 @@ #include "player-effects.h" #include "player-class.h" #include "player-personality.h" -#include "world.h" +#include "world/world.h" #include "spell/spells2.h" #include "io/write-diary.h" #include "cmd/cmd-dump.h" diff --git a/src/floor.c b/src/floor.c index 370242f25..274b968a0 100644 --- a/src/floor.c +++ b/src/floor.c @@ -7,7 +7,7 @@ #include "rooms.h" #include "quest.h" #include "object-hook.h" -#include "world.h" +#include "world/world.h" #include "player-effects.h" #include "object.h" #include "artifact.h" diff --git a/src/grid.c b/src/grid.c index 1b33ddbb1..618386d9f 100644 --- a/src/grid.c +++ b/src/grid.c @@ -19,7 +19,7 @@ #include "util.h" #include "gameterm.h" -#include "world.h" +#include "world/world.h" #include "object-flavor.h" #include "object-hook.h" #include "dungeon.h" diff --git a/src/init.c b/src/init.c index c3cf00737..ed71e3822 100644 --- a/src/init.c +++ b/src/init.c @@ -59,7 +59,7 @@ #include "object/object-kind.h" #include "object-ego.h" #include "rooms-vault.h" -#include "world.h" +#include "world/world.h" #include "market/articles-on-sale.h" #include "market/store-util.h" diff --git a/src/io/exit-panic.c b/src/io/exit-panic.c index 42a4f9ca6..af8d1b346 100644 --- a/src/io/exit-panic.c +++ b/src/io/exit-panic.c @@ -7,7 +7,7 @@ */ #include "exit-panic.h" -#include "world.h" +#include "world/world.h" #include "player-move.h" #include "signal-handlers.h" #include "save.h" diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index 86e950b64..f31eea2b8 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -7,7 +7,7 @@ #include "angband.h" #include "io/input-key-processor.h" -#include "world.h" +#include "world/world.h" #include "core/special-internal-keys.h" #include "dungeon.h" #include "snipe.h" diff --git a/src/io/interpret-pref-file.c b/src/io/interpret-pref-file.c index b94cd0b89..a30e85e61 100644 --- a/src/io/interpret-pref-file.c +++ b/src/io/interpret-pref-file.c @@ -9,7 +9,7 @@ #include "io/tokenizer.h" #include "object/object-kind.h" #include "birth/birth.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" #include "view/display-main-window.h" // 暫定。apply_default_feat_lighting()。後で消す. diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c index bf62852c8..fc9aa3418 100644 --- a/src/io/read-pref-file.c +++ b/src/io/read-pref-file.c @@ -20,7 +20,7 @@ #include "io/interpret-pref-file.h" #include "autopick/autopick-pref-processor.h" #include "files.h" // 暫定。コールバック化して後で消す. -#include "world.h" +#include "world/world.h" // todo コールバック関数に変更するので、いずれ消す. #define PREF_TYPE_NORMAL 0 diff --git a/src/io/signal-handlers.c b/src/io/signal-handlers.c index 39bb203e7..b6239da3c 100644 --- a/src/io/signal-handlers.c +++ b/src/io/signal-handlers.c @@ -9,7 +9,7 @@ #include "core.h" #include "core/game-closer.h" #include "save.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" #include "io/write-diary.h" #include "cmd/cmd-dump.h" diff --git a/src/io/write-diary.c b/src/io/write-diary.c index d75f1a78b..d9c5e9654 100644 --- a/src/io/write-diary.c +++ b/src/io/write-diary.c @@ -10,7 +10,7 @@ #include "files.h" #include "dungeon.h" #include "dungeon-file.h" -#include "world.h" +#include "world/world.h" #include "market/arena-info-table.h" // todo *抹殺* したい… diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c index 31e80437d..60f84f346 100644 --- a/src/knowledge/knowledge-features.c +++ b/src/knowledge/knowledge-features.c @@ -9,7 +9,7 @@ #include "cmd/dump-util.h" #include "core/show-file.h" #include "gameterm.h" -#include "world.h" +#include "world/world.h" #include "cmd/lighting-level-table.h" #include "dungeon.h" #include "view/display-main-window.h" // 暫定、後で消す. diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c index 15a593b3f..2408757bd 100644 --- a/src/knowledge/knowledge-items.c +++ b/src/knowledge/knowledge-items.c @@ -14,7 +14,7 @@ #include "object/object-kind.h" #include "core/show-file.h" #include "cmd/object-group-table.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" #include "core/stuff-handler.h" #include "view/display-main-window.h" // 暫定、後で消す. diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c index a3697607e..a0b2fddee 100644 --- a/src/knowledge/knowledge-monsters.c +++ b/src/knowledge/knowledge-monsters.c @@ -11,7 +11,7 @@ #include "sort.h" #include "cmd/monster-group-table.h" #include "monster-status.h" -#include "world.h" +#include "world/world.h" #include "core/show-file.h" #include "gameterm.h" #include "english.h" diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c index 1b2690e80..98dc85448 100644 --- a/src/knowledge/knowledge-quests.c +++ b/src/knowledge/knowledge-quests.c @@ -14,7 +14,7 @@ #include "dungeon.h" #include "dungeon-file.h" #include "sort.h" -#include "world.h" +#include "world/world.h" #include "core/show-file.h" #include "english.h" diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c index dc6e2820d..8e64900e5 100644 --- a/src/knowledge/knowledge-self.c +++ b/src/knowledge/knowledge-self.c @@ -11,7 +11,7 @@ #include "birth/birth.h" #include "core/show-file.h" #include "dungeon-file.h" -#include "world.h" +#include "world/world.h" #include "market/store-util.h" #include "floor-town.h" #include "object-flavor.h" diff --git a/src/load.c b/src/load.c index a9126111f..ee2ccfbfa 100644 --- a/src/load.c +++ b/src/load.c @@ -80,7 +80,7 @@ #include "player-personality.h" #include "player-sex.h" #include "birth/birth.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "object-ego.h" #include "save.h" diff --git a/src/main-win.c b/src/main-win.c index c04e1b42f..fbf7bd537 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -114,7 +114,7 @@ #include "core/stuff-handler.h" #include "core/special-internal-keys.h" #include "core/player-processor.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" #ifdef WINDOWS diff --git a/src/market/building.c b/src/market/building.c index c061e0f93..48f9d3e73 100644 --- a/src/market/building.c +++ b/src/market/building.c @@ -35,7 +35,7 @@ #include "monsterrace-hook.h" #include "melee.h" #include "wild.h" -#include "world.h" +#include "world/world.h" #include "sort.h" #include "avatar.h" diff --git a/src/market/store.c b/src/market/store.c index 45bb8eef3..44a62c95c 100644 --- a/src/market/store.c +++ b/src/market/store.c @@ -54,7 +54,7 @@ #include "player-effects.h" #include "player/race-info-table.h" #include "mind.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "autopick/autopick.h" #include "autopick/autopick-pref-processor.h" diff --git a/src/monster-status.c b/src/monster-status.c index 8c9e69363..9ad2c0ddb 100644 --- a/src/monster-status.c +++ b/src/monster-status.c @@ -25,7 +25,7 @@ #include "player-effects.h" #include "player-personality.h" #include "view/display-main-window.h" -#include "world.h" +#include "world/world.h" #include "report.h" #include "melee.h" diff --git a/src/monster1.c b/src/monster1.c index 2ed46056b..c040d64e6 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -32,7 +32,7 @@ #include "avatar.h" #include "wild.h" #include "dungeon.h" -#include "world.h" +#include "world/world.h" #include "melee.h" #include "japanese.h" #include "view/display-main-window.h" diff --git a/src/monster2.c b/src/monster2.c index 1e56a2a4a..a40525554 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -38,7 +38,7 @@ #include "monster-spell.h" #include "files.h" #include "view/display-main-window.h" -#include "world.h" +#include "world/world.h" #include "monsterrace.h" #include "creature.h" #include "targeting.h" diff --git a/src/mspells1.c b/src/mspells1.c index 0376a0efc..76ae44077 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -52,7 +52,7 @@ #include "monster.h" #include "monster-spell.h" #include "spell/spells-type.h" -#include "world.h" +#include "world/world.h" #include "realm/realm-song.h" #include "view/display-main-window.h" #include "player-race.h" diff --git a/src/mspells2.c b/src/mspells2.c index 525dfad1e..4f5c785a2 100644 --- a/src/mspells2.c +++ b/src/mspells2.c @@ -27,7 +27,7 @@ #include "monster-spell.h" #include "spell/spells-type.h" #include "dungeon.h" -#include "world.h" +#include "world/world.h" #include "view/display-main-window.h" #include "spell/spells3.h" diff --git a/src/mspells4.c b/src/mspells4.c index b1ecebc61..320556467 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -24,7 +24,7 @@ #include "spell/spells-type.h" #include "melee.h" #include "player-effects.h" -#include "world.h" +#include "world/world.h" #include "view/display-main-window.h" // 暫定、後で消したい. #include "spell/process-effect.h" #include "spell/spells2.h" diff --git a/src/object-flavor.c b/src/object-flavor.c index 3f7037aa7..f2312e50d 100644 --- a/src/object-flavor.c +++ b/src/object-flavor.c @@ -24,7 +24,7 @@ #include "trap.h" #include "snipe.h" #include "files.h" -#include "world.h" +#include "world/world.h" #include "monsterrace.h" #include "object-ego.h" #include "japanese.h" diff --git a/src/object-hook.c b/src/object-hook.c index b9b38d3d8..5ed7588b4 100644 --- a/src/object-hook.c +++ b/src/object-hook.c @@ -9,7 +9,7 @@ #include "player-skill.h" #include "player/mimic-info-table.h" #include "quest.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "view/display-main-window.h" diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c index 0d261536d..858eabdc8 100644 --- a/src/object/lite-processor.c +++ b/src/object/lite-processor.c @@ -3,7 +3,7 @@ #include "object-ego.h" #include "object-hook.h" #include "player-move.h" -#include "world.h" +#include "world/world.h" /*! * @brief 10ゲームターンが進行する毎に光源の寿命を減らす処理 diff --git a/src/object2.c b/src/object2.c index 6f720156b..9b0c6a6dd 100644 --- a/src/object2.c +++ b/src/object2.c @@ -14,7 +14,7 @@ #include "angband.h" #include "util.h" #include "main/sound-definitions-table.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" #include "object.h" diff --git a/src/player-damage.c b/src/player-damage.c index 0ca39cfb5..66ae9536c 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -25,7 +25,7 @@ #include "player-class.h" #include "player-race.h" #include "monster-spell.h" -#include "world.h" +#include "world/world.h" #include "view/display-main-window.h" #include "quest.h" #include "report.h" diff --git a/src/player-effects.c b/src/player-effects.c index 22290d346..2aabefe69 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -48,7 +48,7 @@ #include "snipe.h" #include "files.h" #include "monster-spell.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "autopick/autopick-reader-writer.h" #include "save.h" diff --git a/src/player-move.c b/src/player-move.c index 27bee4a35..6fa2930de 100644 --- a/src/player-move.c +++ b/src/player-move.c @@ -172,7 +172,7 @@ #include "spell/spells-type.h" #include "cmd-basic.h" #include "view/display-main-window.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "autopick/autopick.h" #include "targeting.h" diff --git a/src/player-status.c b/src/player-status.c index 73849414c..b9d7eb797 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -41,7 +41,7 @@ #include "io/write-diary.h" #include "cmd/cmd-dump.h" #include "melee.h" -#include "world.h" +#include "world/world.h" #include "view/display-main-window.h" #include "files.h" #include "cmd-magiceat.h" diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c index 0db1bbff2..336ccde68 100644 --- a/src/player/digestion-processor.c +++ b/src/player/digestion-processor.c @@ -1,6 +1,6 @@ #include "angband.h" #include "player/digestion-processor.h" -#include "world.h" +#include "world/world.h" #include "realm/realm-song.h" #include "player-damage.h" #include "player-effects.h" diff --git a/src/player/process-death.c b/src/player/process-death.c index 0b432c0c4..8a0a8ad4d 100644 --- a/src/player/process-death.c +++ b/src/player/process-death.c @@ -7,7 +7,7 @@ */ #include "process-death.h" -#include "world.h" +#include "world/world.h" #include "floor-town.h" #include "player-inventory.h" #include "object-flavor.h" diff --git a/src/player/process-name.c b/src/player/process-name.c index b26676189..4d1757778 100644 --- a/src/player/process-name.c +++ b/src/player/process-name.c @@ -2,7 +2,7 @@ #include "autopick/autopick-reader-writer.h" #include "player-personality.h" #include "files.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" /*! diff --git a/src/quest.c b/src/quest.c index b55504844..752d71f5e 100644 --- a/src/quest.c +++ b/src/quest.c @@ -15,7 +15,7 @@ #include "player-personality.h" #include "artifact.h" #include "feature.h" -#include "world.h" +#include "world/world.h" #include "io/write-diary.h" #include "cmd/cmd-dump.h" #include "english.h" diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c index b6716cfbf..6a70911b6 100644 --- a/src/realm/realm-crusade.c +++ b/src/realm/realm-crusade.c @@ -1,7 +1,7 @@ #include "angband.h" #include "util.h" -#include "world.h" +#include "world/world.h" #include "cmd-spell.h" #include "effect/effect-characteristics.h" #include "spell/spells-type.h" diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c index 5e7d19ecc..1dbe23462 100644 --- a/src/realm/realm-hex.c +++ b/src/realm/realm-hex.c @@ -36,7 +36,7 @@ #include "targeting.h" #include "realm/realm-song.h" #include "view/display-main-window.h" -#include "world.h" +#include "world/world.h" #include "realm/realm-hex.h" #include "spell/spells-execution.h" #include "spell/spells-type.h" diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c index e939c5975..c5e2e0baf 100644 --- a/src/realm/realm-hissatsu.c +++ b/src/realm/realm-hissatsu.c @@ -20,7 +20,7 @@ #include "targeting.h" #include "view/display-main-window.h" #include "spells-floor.h" -#include "world.h" +#include "world/world.h" #include "effect/spells-effect-util.h" #include "spell/spells-util.h" #include "spell/spells-type.h" diff --git a/src/report.c b/src/report.c index 73d49aaa3..9f5b67dc0 100644 --- a/src/report.c +++ b/src/report.c @@ -14,7 +14,7 @@ #include "player-personality.h" #include "character-dump.h" -#include "world.h" +#include "world/world.h" #include "gameterm.h" #ifdef WORLD_SCORE diff --git a/src/rumor.c b/src/rumor.c index 544e373e1..8e9698d9e 100644 --- a/src/rumor.c +++ b/src/rumor.c @@ -9,7 +9,7 @@ #include "monsterrace.h" #include "floor-town.h" #include "wild.h" -#include "world.h" +#include "world/world.h" /* * Display a rumor and apply its effects diff --git a/src/save.c b/src/save.c index 42a316ae9..bca1d6f63 100644 --- a/src/save.c +++ b/src/save.c @@ -31,7 +31,7 @@ #include "floor-town.h" #include "io/uid-checker.h" #include "files.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "monsterrace.h" #include "birth/birth.h" diff --git a/src/scores.c b/src/scores.c index 14dbc3775..7705e5340 100644 --- a/src/scores.c +++ b/src/scores.c @@ -27,7 +27,7 @@ #include "files.h" #include "scores.h" #include "floor.h" -#include "world.h" +#include "world/world.h" #include "io/write-diary.h" #include "cmd/cmd-dump.h" #include "report.h" diff --git a/src/spell/spells2.c b/src/spell/spells2.c index addf4c91e..1f90c8777 100644 --- a/src/spell/spells2.c +++ b/src/spell/spells2.c @@ -28,7 +28,7 @@ #include "trap.h" #include "monsterrace-hook.h" #include "melee.h" -#include "world.h" +#include "world/world.h" #include "spell/spells2.h" #include "spell/spells3.h" #include "spells-summon.h" diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 718c5e7b0..0ba291de3 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -59,7 +59,7 @@ #include "view/display-main-window.h" #include "mind.h" #include "wild.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "autopick/autopick.h" #include "targeting.h" diff --git a/src/spells-world.c b/src/spells-world.c index edc7c127d..b4cb6f32d 100644 --- a/src/spells-world.c +++ b/src/spells-world.c @@ -1,6 +1,6 @@ #include "angband.h" #include "util.h" -#include "world.h" +#include "world/world.h" /*! * @brief プレイ日数を変更する / Set gametime. diff --git a/src/targeting.c b/src/targeting.c index ce44e15d5..f1f102fbf 100644 --- a/src/targeting.c +++ b/src/targeting.c @@ -39,7 +39,7 @@ #include "feature.h" #include "quest.h" #include "dungeon.h" -#include "world.h" +#include "world/world.h" #include "effect/spells-effect-util.h" /*! diff --git a/src/trap.c b/src/trap.c index b6469bbc9..94c6d5728 100644 --- a/src/trap.c +++ b/src/trap.c @@ -23,7 +23,7 @@ #include "init.h" #include "files.h" #include "dungeon.h" -#include "world.h" +#include "world/world.h" #include "spell/process-effect.h" #include "spell/spells2.h" #include "spell/spells3.h" diff --git a/src/util.c b/src/util.c index 3c7f2b880..a5c2d5ac3 100644 --- a/src/util.c +++ b/src/util.c @@ -22,7 +22,7 @@ #include "view/display-main-window.h" #include "quest.h" #include "floor.h" -#include "world.h" +#include "world/world.h" #include "io/write-diary.h" #include "cmd/cmd-dump.h" #include "japanese.h" diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c index 5394ce732..e9461fffc 100644 --- a/src/view/display-main-window.c +++ b/src/view/display-main-window.c @@ -21,7 +21,7 @@ #include "core.h" #include "core/stuff-handler.h" #include "files.h" -#include "world.h" +#include "world/world.h" #include "quest.h" #include "artifact.h" #include "avatar.h" diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c index 0d836aca0..918ccfd20 100644 --- a/src/view/display-player-middle.c +++ b/src/view/display-player-middle.c @@ -4,7 +4,7 @@ #include "player-effects.h" #include "player-skill.h" #include "realm/realm-song.h" -#include "world.h" +#include "world/world.h" #include "object/object-kind.h" #include "object-hook.h" #include "shoot.h" diff --git a/src/view/display-player.c b/src/view/display-player.c index 55e98d6a3..f74699836 100644 --- a/src/view/display-player.c +++ b/src/view/display-player.c @@ -13,7 +13,7 @@ #include "status-first-page.h" #include "player-sex.h" #include "patron.h" -#include "world.h" +#include "world/world.h" #include "quest.h" #include "core.h" // 暫定。後で消す #include "knowledge/knowledge-mutations.h" diff --git a/src/wild.c b/src/wild.c index 175eb2390..818aab6d5 100644 --- a/src/wild.c +++ b/src/wild.c @@ -17,7 +17,7 @@ #include "dungeon.h" #include "floor.h" #include "wild.h" -#include "world.h" +#include "world/world.h" #include "monster.h" #include "realm/realm-hex.h" #include "player-status.h" diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index 3da621f1b..b993b73a3 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -57,7 +57,7 @@ #include "object/object-kind.h" #include "targeting.h" #include "view/display-main-window.h" -#include "world.h" +#include "world/world.h" #include "spell/spells2.h" #include "spell/spells3.h" diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c index afd42dc97..390835b81 100644 --- a/src/world/world-movement-processor.c +++ b/src/world/world-movement-processor.c @@ -4,7 +4,7 @@ #include "io/write-diary.h" #include "dungeon.h" #include "quest.h" -#include "world.h" +#include "world/world.h" #include "cmd/cmd-save.h" #include "player-move.h" #include "view/display-main-window.h" diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c index 804071586..221ab0e93 100644 --- a/src/world/world-turn-processor.c +++ b/src/world/world-turn-processor.c @@ -1,6 +1,6 @@ #include "angband.h" #include "world/world-turn-processor.h" -#include "world.h" +#include "world/world.h" #include "dungeon.h" #include "market/store.h" #include "market/store-util.h" diff --git a/src/world.c b/src/world/world.c similarity index 98% rename from src/world.c rename to src/world/world.c index 465e3a301..233a0855d 100644 --- a/src/world.c +++ b/src/world/world.c @@ -1,5 +1,5 @@ #include "angband.h" -#include "world.h" +#include "world/world.h" #include "player-race.h" world_type world; diff --git a/src/world.h b/src/world/world.h similarity index 100% rename from src/world.h rename to src/world/world.h -- 2.11.0