From 168bcb4f37f61b99c7e2ee3aa33673254f4cace6 Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 15 May 2020 22:36:46 +0900 Subject: [PATCH] [Refactor] #38862 Moved wild.c/h to floor/ --- Hengband/Hengband/Hengband.vcxproj | 4 ++-- Hengband/Hengband/Hengband.vcxproj.filters | 12 ++++++------ src/Makefile.am | 3 ++- src/birth/birth.c | 2 +- src/cmd/cmd-basic.c | 2 +- src/core/game-play.c | 2 +- src/core/player-processor.c | 2 +- src/dungeon/dungeon-file.c | 2 +- src/floor/floor-generate.c | 2 +- src/floor/floor-save.c | 2 +- src/{ => floor}/wild.c | 2 +- src/{ => floor}/wild.h | 0 src/init.c | 2 +- src/io/input-key-processor.c | 2 +- src/io/load.c | 2 +- src/io/save.c | 2 +- src/market/building.c | 2 +- src/market/store.c | 2 +- src/monster/monster1.c | 2 +- src/monster/monster2.c | 2 +- src/player/player-damage.c | 2 +- src/player/player-effects.c | 2 +- src/room/rooms-city.c | 2 +- src/room/rooms-vault.c | 2 +- src/rumor.c | 2 +- src/spell/spells3.c | 2 +- src/world/world-turn-processor.c | 2 +- 27 files changed, 33 insertions(+), 32 deletions(-) rename src/{ => floor}/wild.c (99%) rename src/{ => floor}/wild.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 86f8b00a3..210691ae0 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -512,7 +512,7 @@ - + @@ -721,7 +721,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index e081174a1..a06347a1e 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -608,9 +608,6 @@ world - - floor - world @@ -833,6 +830,9 @@ term + + floor + @@ -1481,9 +1481,6 @@ world - - floor - world @@ -1709,6 +1706,9 @@ term + + floor + diff --git a/src/Makefile.am b/src/Makefile.am index dd6014f5f..60e47917f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -106,6 +106,7 @@ hengband_SOURCES = \ floor/floor-save.h floor/floor-save.c floor/floor-town.h floor/floor-town.c \ floor/floor-streams.c floor/floor-streams.h \ floor/pattern-walk.c floor/pattern-walk.h \ + floor/wild.h floor/wild.c \ \ locale/japanese.c locale/japanese.h locale/english.c locale/english.h \ \ @@ -242,7 +243,7 @@ hengband_SOURCES = \ spells-world.c spells-world.h \ \ sort.c sort.h util.c util.h \ - wild.h wild.c warning.c warning.h \ + warning.c warning.h \ \ view-mainwindow.c view-mainwindow.h targeting.c targeting.h \ \ diff --git a/src/birth/birth.c b/src/birth/birth.c index dbb1613bd..1427e8b0c 100644 --- a/src/birth/birth.c +++ b/src/birth/birth.c @@ -57,7 +57,7 @@ #include "spell/spells-status.h" #include "view/display-main-window.h" // 暫定。後で消す. #include "view/display-player.h" // 暫定。後で消す. -#include "wild.h" +#include "floor/wild.h" #include "world/world.h" /* diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index f3059aa1a..418854a81 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -32,7 +32,7 @@ #include "player/player-status.h" #include "realm/realm-hex.h" #include "geometry.h" -#include "wild.h" +#include "floor/wild.h" #include "grid/grid.h" #include "player/player-move.h" #include "player/player-effects.h" diff --git a/src/core/game-play.c b/src/core/game-play.c index 818c9ec64..8c3528291 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -41,7 +41,7 @@ #include "spell/technic-info-table.h" #include "spell/spells-status.h" #include "view/display-player.h" -#include "wild.h" +#include "floor/wild.h" #include "world/world.h" #include "autopick/autopick-pref-processor.h" #include "core/game-closer.h" diff --git a/src/core/player-processor.c b/src/core/player-processor.c index 1db9a17a6..e68a93ab3 100644 --- a/src/core/player-processor.c +++ b/src/core/player-processor.c @@ -16,7 +16,7 @@ #include "realm/realm-hex.h" #include "spell/music-checker.h" #include "monster/monsterrace-hook.h" -#include "wild.h" +#include "floor/wild.h" bool load = TRUE; bool can_save = FALSE; diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c index 19e6720ac..626e55776 100644 --- a/src/dungeon/dungeon-file.c +++ b/src/dungeon/dungeon-file.c @@ -61,7 +61,7 @@ #include "object/artifact.h" #include "cmd-activate.h" #include "term/gameterm.h" -#include "wild.h" +#include "floor/wild.h" #include "view/display-main-window.h" #include "player/player-class.h" diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c index f011cbafb..4883048d7 100644 --- a/src/floor/floor-generate.c +++ b/src/floor/floor-generate.c @@ -118,7 +118,7 @@ #include "monster/monster.h" #include "quest.h" #include "player/player-status.h" -#include "wild.h" +#include "floor/wild.h" #include "monster/monster-status.h" #include "dungeon/dungeon-file.h" #include "init.h" diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c index 106c3e781..ff5603b4a 100644 --- a/src/floor/floor-save.c +++ b/src/floor/floor-save.c @@ -27,7 +27,7 @@ #include "grid/grid.h" #include "monster/monster.h" #include "quest.h" -#include "wild.h" +#include "floor/wild.h" #include "spell/spells-floor.h" #include "monster/monster-status.h" #include "object/object-hook.h" diff --git a/src/wild.c b/src/floor/wild.c similarity index 99% rename from src/wild.c rename to src/floor/wild.c index aefcada92..d7b3f3370 100644 --- a/src/wild.c +++ b/src/floor/wild.c @@ -16,7 +16,7 @@ #include "dungeon/dungeon.h" #include "floor/floor.h" -#include "wild.h" +#include "floor/wild.h" #include "world/world.h" #include "monster/monster.h" #include "realm/realm-hex.h" diff --git a/src/wild.h b/src/floor/wild.h similarity index 100% rename from src/wild.h rename to src/floor/wild.h diff --git a/src/init.c b/src/init.c index 98976fd11..f19c0155a 100644 --- a/src/init.c +++ b/src/init.c @@ -46,7 +46,7 @@ #include "grid/trap.h" #include "room/rooms.h" #include "market/store.h" -#include "wild.h" +#include "floor/wild.h" #include "dungeon/dungeon-file.h" #include "io/files.h" #include "grid/feature.h" diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index 718b5f75f..9a05e5874 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -19,7 +19,7 @@ #include "player/player-effects.h" #include "market/store.h" // do_cmd_store() がある。後で移設する. #include "quest.h" // do_cmd_quest() がある。後で移設する. -#include "wild.h" +#include "floor/wild.h" #include "spell/spells-object.h" #include "mind.h" // do_cmd_mind_browse() がある。後で移設する. #include "spell/monster-spell.h" // do_cmd_cast_learned() がある。後で移設する. diff --git a/src/io/load.c b/src/io/load.c index c5d9361ca..135315f29 100644 --- a/src/io/load.c +++ b/src/io/load.c @@ -62,7 +62,7 @@ #include "player/avatar.h" #include "spell/spells-status.h" #include "object/object-hook.h" -#include "wild.h" +#include "floor/wild.h" #include "patron.h" #include "floor/floor.h" diff --git a/src/io/save.c b/src/io/save.c index 526fef7c3..6d63fc8d8 100644 --- a/src/io/save.c +++ b/src/io/save.c @@ -24,7 +24,7 @@ #include "quest.h" #include "market/store.h" #include "market/store-util.h" -#include "wild.h" +#include "floor/wild.h" #include "floor/floor.h" #include "floor/floor-events.h" #include "floor/floor-save.h" diff --git a/src/market/building.c b/src/market/building.c index 5a2e49282..28f0f877f 100644 --- a/src/market/building.c +++ b/src/market/building.c @@ -34,7 +34,7 @@ #include "monster/monster.h" #include "monster/monsterrace-hook.h" #include "melee.h" -#include "wild.h" +#include "floor/wild.h" #include "world/world.h" #include "sort.h" diff --git a/src/market/store.c b/src/market/store.c index 80817877b..dba541ee4 100644 --- a/src/market/store.c +++ b/src/market/store.c @@ -61,7 +61,7 @@ #include "floor/floor-town.h" #include "locale/japanese.h" #include "view/display-main-window.h" -#include "wild.h" +#include "floor/wild.h" #define MIN_STOCK 12 diff --git a/src/monster/monster1.c b/src/monster/monster1.c index 1d408f39e..398177e8b 100644 --- a/src/monster/monster1.c +++ b/src/monster/monster1.c @@ -30,7 +30,7 @@ #include "quest.h" #include "object/artifact.h" #include "player/avatar.h" -#include "wild.h" +#include "floor/wild.h" #include "dungeon/dungeon.h" #include "world/world.h" #include "melee.h" diff --git a/src/monster/monster2.c b/src/monster/monster2.c index 6a7e59314..91c5294b3 100644 --- a/src/monster/monster2.c +++ b/src/monster/monster2.c @@ -33,7 +33,7 @@ #include "player/player-race.h" #include "player/player-class.h" #include "player/player-personality.h" -#include "wild.h" +#include "floor/wild.h" #include "warning.h" #include "spell/monster-spell.h" #include "io/files.h" diff --git a/src/player/player-damage.c b/src/player/player-damage.c index af8d430e8..f5f46f918 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -29,7 +29,7 @@ #include "view/display-main-window.h" #include "quest.h" #include "report.h" -#include "wild.h" +#include "floor/wild.h" #include "io/save.h" #include "io/files.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index 475b6cb64..6723f1b46 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -33,7 +33,7 @@ #include "realm/realm-hex.h" #include "object/object-ego.h" #include "object/object-hook.h" -#include "wild.h" +#include "floor/wild.h" #include "spell/spells-floor.h" #include "player/player-status.h" #include "player/player-class.h" diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c index afdf0d81e..b787f4428 100644 --- a/src/room/rooms-city.c +++ b/src/room/rooms-city.c @@ -7,7 +7,7 @@ #include "room/rooms.h" #include "room/rooms-city.h" #include "market/store.h" -#include "wild.h" +#include "floor/wild.h" #include "market/store-util.h" /* diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c index e27a8a955..599db4af5 100644 --- a/src/room/rooms-vault.c +++ b/src/room/rooms-vault.c @@ -12,7 +12,7 @@ #include "floor/floor.h" #include "dungeon/dungeon.h" #include "geometry.h" -#include "wild.h" +#include "floor/wild.h" #include "market/store-util.h" /* diff --git a/src/rumor.c b/src/rumor.c index 98cb0ea28..4a5ae9014 100644 --- a/src/rumor.c +++ b/src/rumor.c @@ -8,7 +8,7 @@ #include "dungeon/dungeon.h" #include "monster/monsterrace.h" #include "floor/floor-town.h" -#include "wild.h" +#include "floor/wild.h" #include "world/world.h" /* diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 03970de98..6ad120a21 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -58,7 +58,7 @@ #include "player/player-personality.h" #include "view/display-main-window.h" #include "mind.h" -#include "wild.h" +#include "floor/wild.h" #include "world/world.h" #include "object/object-kind.h" #include "autopick/autopick.h" diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c index 48655622a..8e3c2f9cb 100644 --- a/src/world/world-turn-processor.c +++ b/src/world/world-turn-processor.c @@ -10,7 +10,7 @@ #include "cmd/cmd-save.h" #include "monster/monster-status.h" #include "player/player-move.h" -#include "wild.h" +#include "floor/wild.h" #include "player/digestion-processor.h" #include "core/hp-mp-processor.h" #include "core/magic-effects-timeout-reducer.h" -- 2.11.0