From a21fb603979dfcded289c85ecf00129c1681f99b Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 15 May 2020 18:42:01 +0900 Subject: [PATCH] [Refactor] #38862 Moved room*.c/h to room/ --- Hengband/Hengband/Hengband.vcxproj | 30 +++++----- Hengband/Hengband/Hengband.vcxproj.filters | 96 +++++++++++++++--------------- src/Makefile.am | 12 ++-- src/dungeon/dungeon-file.c | 4 +- src/effect/effect-feature.c | 2 +- src/floor/floor-generate.c | 2 +- src/floor/floor-streams.c | 2 +- src/floor/floor.c | 2 +- src/grid.c | 2 +- src/init.c | 6 +- src/{ => room}/rooms-city.c | 4 +- src/{ => room}/rooms-city.h | 0 src/{ => room}/rooms-fractal.c | 4 +- src/{ => room}/rooms-fractal.h | 0 src/{ => room}/rooms-normal.c | 2 +- src/{ => room}/rooms-normal.h | 0 src/{ => room}/rooms-special.c | 2 +- src/{ => room}/rooms-special.h | 0 src/{ => room}/rooms-trap.c | 2 +- src/{ => room}/rooms-trap.h | 0 src/{ => room}/rooms-vault.c | 4 +- src/{ => room}/rooms-vault.h | 0 src/{ => room}/rooms.c | 14 ++--- src/{ => room}/rooms.h | 0 src/spells-diceroll.c | 2 +- 25 files changed, 98 insertions(+), 94 deletions(-) rename src/{ => room}/rooms-city.c (99%) rename src/{ => room}/rooms-city.h (100%) rename src/{ => room}/rooms-fractal.c (97%) rename src/{ => room}/rooms-fractal.h (100%) rename src/{ => room}/rooms-normal.c (99%) rename src/{ => room}/rooms-normal.h (100%) rename src/{ => room}/rooms-special.c (99%) rename src/{ => room}/rooms-special.h (100%) rename src/{ => room}/rooms-trap.c (99%) rename src/{ => room}/rooms-trap.h (100%) rename src/{ => room}/rooms-vault.c (99%) rename src/{ => room}/rooms-vault.h (100%) rename src/{ => room}/rooms.c (99%) rename src/{ => room}/rooms.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 975168f2f..80052f448 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -469,14 +469,14 @@ - - - + + + - - - - + + + + @@ -692,14 +692,14 @@ - - - - - - - - + + + + + + + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index cfbdf439b..7be87b778 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -24,27 +24,6 @@ spell - - floor - - - floor - - - floor - - - floor - - - floor - - - floor - - - floor - player @@ -520,9 +499,6 @@ room - - room - io @@ -829,6 +805,30 @@ object + + room + + + room + + + room + + + room + + + room + + + room + + + room + + + room + @@ -860,27 +860,6 @@ spell - - floor - - - floor - - - floor - - - floor - - - floor - - - floor - - - floor - player @@ -1370,9 +1349,6 @@ room - - room - io @@ -1691,6 +1667,30 @@ object + + room + + + room + + + room + + + room + + + room + + + room + + + room + + + room + diff --git a/src/Makefile.am b/src/Makefile.am index a7f124c7f..fbf5072f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -184,12 +184,16 @@ hengband_SOURCES = \ realm/realm-sorcery.h realm/realm-trump.c realm/realm-trump.h \ \ report.c report.h \ - rooms.c rooms-city.c rooms-city.h rooms-fractal.c rooms-fractal.h \ - rooms.h rooms-normal.c rooms-normal.h \ - rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h \ - rooms-vault.c rooms-vault.h \ + \ + room/rooms.c room/rooms.h room/rooms-city.c room/rooms-city.h \ + room/rooms-fractal.c room/rooms-fractal.h \ + room/rooms-normal.c room/rooms-normal.h \ + room/rooms-special.c room/rooms-special.h \ + room/rooms-trap.c room/rooms-trap.h \ + room/rooms-vault.c room/rooms-vault.h \ room/rooms-pit-nest.c room/rooms-pit-nest.h \ room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \ + \ save.c save.h scores.c scores.h selfinfo.c selfinfo.h \ snipe.c snipe.h \ \ diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c index a2aaefe42..bd3531912 100644 --- a/src/dungeon/dungeon-file.c +++ b/src/dungeon/dungeon-file.c @@ -38,7 +38,7 @@ #include "io/tokenizer.h" #include "files.h" #include "dungeon/dungeon-file.h" -#include "rooms-vault.h" +#include "room/rooms-vault.h" #include "feature.h" #include "grid.h" #include "quest.h" @@ -50,7 +50,7 @@ #include "floor/floor.h" #include "market/building.h" #include "world/world.h" -#include "rooms-vault.h" +#include "room/rooms-vault.h" #include "object/object-kind.h" #include "object/object-ego.h" #include "monsterrace.h" diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c index 9f0b9d911..ff186466b 100644 --- a/src/effect/effect-feature.c +++ b/src/effect/effect-feature.c @@ -1,6 +1,6 @@ #include "angband.h" #include "effect/effect-feature.h" -#include "rooms.h" +#include "room/rooms.h" #include "dungeon/dungeon.h" #include "main/sound-definitions-table.h" #include "trap.h" diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c index c79e999bb..b1df81226 100644 --- a/src/floor/floor-generate.c +++ b/src/floor/floor-generate.c @@ -105,7 +105,7 @@ #include "cmd/cmd-dump.h" #include "grid.h" #include "market/arena-info-table.h" -#include "rooms.h" +#include "room/rooms.h" #include "dungeon/dungeon.h" #include "floor/floor.h" #include "floor/floor-save.h" diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c index 742f9cde1..9ffc3ddd2 100644 --- a/src/floor/floor-streams.c +++ b/src/floor/floor-streams.c @@ -30,7 +30,7 @@ #include "object/object-hook.h" #include "spell/spells1.h" #include "spells-floor.h" -#include "rooms.h" +#include "room/rooms.h" /*! diff --git a/src/floor/floor.c b/src/floor/floor.c index 6dcb6f076..f21c5855d 100644 --- a/src/floor/floor.c +++ b/src/floor/floor.c @@ -4,7 +4,7 @@ #include "floor/floor-generate.h" #include "grid.h" #include "dungeon/dungeon.h" -#include "rooms.h" +#include "room/rooms.h" #include "quest.h" #include "object/object-hook.h" #include "world/world.h" diff --git a/src/grid.c b/src/grid.c index cefc6b6cb..8a81622e8 100644 --- a/src/grid.c +++ b/src/grid.c @@ -26,7 +26,7 @@ #include "floor/floor-generate.h" #include "grid.h" #include "trap.h" -#include "rooms.h" +#include "room/rooms.h" #include "monster.h" #include "quest.h" #include "feature.h" diff --git a/src/init.c b/src/init.c index 671d50a44..1750ba8d3 100644 --- a/src/init.c +++ b/src/init.c @@ -44,7 +44,7 @@ #include "init.h" #include "quest.h" #include "trap.h" -#include "rooms.h" +#include "room/rooms.h" #include "market/store.h" #include "wild.h" #include "dungeon/dungeon-file.h" @@ -53,12 +53,12 @@ #include "floor/floor.h" #include "floor/floor-town.h" #include "dungeon/dungeon.h" -#include "rooms-vault.h" +#include "room/rooms-vault.h" #include "player-skill.h" #include "player-class.h" #include "object/object-kind.h" #include "object/object-ego.h" -#include "rooms-vault.h" +#include "room/rooms-vault.h" #include "world/world.h" #include "market/articles-on-sale.h" #include "market/store-util.h" diff --git a/src/rooms-city.c b/src/room/rooms-city.c similarity index 99% rename from src/rooms-city.c rename to src/room/rooms-city.c index c08a9b453..372b7fc94 100644 --- a/src/rooms-city.c +++ b/src/room/rooms-city.c @@ -4,8 +4,8 @@ #include "grid.h" #include "floor/floor.h" #include "floor/floor-generate.h" -#include "rooms.h" -#include "rooms-city.h" +#include "room/rooms.h" +#include "room/rooms-city.h" #include "market/store.h" #include "wild.h" #include "market/store-util.h" diff --git a/src/rooms-city.h b/src/room/rooms-city.h similarity index 100% rename from src/rooms-city.h rename to src/room/rooms-city.h diff --git a/src/rooms-fractal.c b/src/room/rooms-fractal.c similarity index 97% rename from src/rooms-fractal.c rename to src/room/rooms-fractal.c index 64c2321d0..73682ea9e 100644 --- a/src/rooms-fractal.c +++ b/src/room/rooms-fractal.c @@ -1,8 +1,8 @@ #include "angband.h" #include "grid.h" #include "floor/floor-generate.h" -#include "rooms.h" -#include "rooms-normal.h" +#include "room/rooms.h" +#include "room/rooms-normal.h" #include "floor/floor.h" #include "dungeon/dungeon.h" diff --git a/src/rooms-fractal.h b/src/room/rooms-fractal.h similarity index 100% rename from src/rooms-fractal.h rename to src/room/rooms-fractal.h diff --git a/src/rooms-normal.c b/src/room/rooms-normal.c similarity index 99% rename from src/rooms-normal.c rename to src/room/rooms-normal.c index 511e96013..764a5dfd8 100644 --- a/src/rooms-normal.c +++ b/src/room/rooms-normal.c @@ -4,7 +4,7 @@ #include "floor/floor.h" #include "dungeon/dungeon.h" -#include "rooms.h" +#include "room/rooms.h" /*! diff --git a/src/rooms-normal.h b/src/room/rooms-normal.h similarity index 100% rename from src/rooms-normal.h rename to src/room/rooms-normal.h diff --git a/src/rooms-special.c b/src/room/rooms-special.c similarity index 99% rename from src/rooms-special.c rename to src/room/rooms-special.c index f71ca17be..282e66209 100644 --- a/src/rooms-special.c +++ b/src/room/rooms-special.c @@ -3,7 +3,7 @@ #include "grid.h" #include "floor/floor-generate.h" -#include "rooms.h" +#include "room/rooms.h" #include "monster.h" #include "monsterrace-hook.h" #include "object/object-kind-hook.h" diff --git a/src/rooms-special.h b/src/room/rooms-special.h similarity index 100% rename from src/rooms-special.h rename to src/room/rooms-special.h diff --git a/src/rooms-trap.c b/src/room/rooms-trap.c similarity index 99% rename from src/rooms-trap.c rename to src/room/rooms-trap.c index 3f0884c61..59aa8ff9d 100644 --- a/src/rooms-trap.c +++ b/src/room/rooms-trap.c @@ -3,7 +3,7 @@ #include "grid.h" #include "floor/floor-generate.h" -#include "rooms.h" +#include "room/rooms.h" #include "floor/floor.h" #include "feature.h" #include "dungeon/dungeon.h" diff --git a/src/rooms-trap.h b/src/room/rooms-trap.h similarity index 100% rename from src/rooms-trap.h rename to src/room/rooms-trap.h diff --git a/src/rooms-vault.c b/src/room/rooms-vault.c similarity index 99% rename from src/rooms-vault.c rename to src/room/rooms-vault.c index 52ae91a52..4da05abbd 100644 --- a/src/rooms-vault.c +++ b/src/room/rooms-vault.c @@ -1,10 +1,10 @@ #include "angband.h" #include "util.h" -#include "rooms-vault.h" +#include "room/rooms-vault.h" #include "floor/floor-generate.h" #include "grid.h" -#include "rooms.h" +#include "room/rooms.h" #include "market/store.h" #include "trap.h" #include "monster.h" diff --git a/src/rooms-vault.h b/src/room/rooms-vault.h similarity index 100% rename from src/rooms-vault.h rename to src/room/rooms-vault.h diff --git a/src/rooms.c b/src/room/rooms.c similarity index 99% rename from src/rooms.c rename to src/room/rooms.c index c08f8bf0a..195845aa7 100644 --- a/src/rooms.c +++ b/src/room/rooms.c @@ -44,15 +44,15 @@ #include "floor/floor-generate.h" #include "dungeon/dungeon.h" #include "grid.h" -#include "rooms.h" +#include "room/rooms.h" -#include "rooms-city.h" -#include "rooms-fractal.h" -#include "rooms-normal.h" +#include "room/rooms-city.h" +#include "room/rooms-fractal.h" +#include "room/rooms-normal.h" #include "room/rooms-pit-nest.h" -#include "rooms-special.h" -#include "rooms-trap.h" -#include "rooms-vault.h" +#include "room/rooms-special.h" +#include "room/rooms-trap.h" +#include "room/rooms-vault.h" #include "trap.h" diff --git a/src/rooms.h b/src/room/rooms.h similarity index 100% rename from src/rooms.h rename to src/room/rooms.h diff --git a/src/spells-diceroll.c b/src/spells-diceroll.c index 873fc0fed..6bb7c294d 100644 --- a/src/spells-diceroll.c +++ b/src/spells-diceroll.c @@ -6,7 +6,7 @@ #include "monsterrace-hook.h" #include "player-class.h" #include "mutation/mutation.h" -#include "rooms.h" +#include "room/rooms.h" /*! -- 2.11.0