From ac9c84a1cff0dcc11a2482ecac869fca7c3b36a1 Mon Sep 17 00:00:00 2001 From: Hourier Date: Wed, 29 Apr 2020 11:16:03 +0900 Subject: [PATCH] [WIP] [Refactor] #39963 Moved realm*.c/h to realm/realm*.c/h --- Hengband_vcs2017/Hengband/Hengband.vcxproj | 56 +++---- Hengband_vcs2017/Hengband/Hengband.vcxproj.filters | 171 +++++++++++---------- src/Makefile.am | 21 ++- src/{ => realm}/realm-arcane.c | 0 src/{ => realm}/realm-arcane.h | 0 src/{ => realm}/realm-chaos.c | 0 src/{ => realm}/realm-chaos.h | 0 src/{ => realm}/realm-craft.c | 0 src/{ => realm}/realm-craft.h | 0 src/{ => realm}/realm-crusade.c | 0 src/{ => realm}/realm-crusade.h | 0 src/{ => realm}/realm-daemon.c | 0 src/{ => realm}/realm-daemon.h | 0 src/{ => realm}/realm-death.c | 0 src/{ => realm}/realm-death.h | 0 src/{ => realm}/realm-hex.c | 0 src/{ => realm}/realm-hex.h | 0 src/{ => realm}/realm-hissatsu.c | 0 src/{ => realm}/realm-hissatsu.h | 0 src/{ => realm}/realm-life.c | 0 src/{ => realm}/realm-life.h | 0 src/{ => realm}/realm-nature.c | 0 src/{ => realm}/realm-nature.h | 0 src/{ => realm}/realm-song.c | 0 src/{ => realm}/realm-song.h | 0 src/{ => realm}/realm-sorcery.c | 0 src/{ => realm}/realm-sorcery.h | 0 src/{ => realm}/realm-trump.c | 0 src/{ => realm}/realm-trump.h | 0 src/{ => realm}/realm.c | 0 src/{ => realm}/realm.h | 0 31 files changed, 129 insertions(+), 119 deletions(-) rename src/{ => realm}/realm-arcane.c (100%) rename src/{ => realm}/realm-arcane.h (100%) rename src/{ => realm}/realm-chaos.c (100%) rename src/{ => realm}/realm-chaos.h (100%) rename src/{ => realm}/realm-craft.c (100%) rename src/{ => realm}/realm-craft.h (100%) rename src/{ => realm}/realm-crusade.c (100%) rename src/{ => realm}/realm-crusade.h (100%) rename src/{ => realm}/realm-daemon.c (100%) rename src/{ => realm}/realm-daemon.h (100%) rename src/{ => realm}/realm-death.c (100%) rename src/{ => realm}/realm-death.h (100%) rename src/{ => realm}/realm-hex.c (100%) rename src/{ => realm}/realm-hex.h (100%) rename src/{ => realm}/realm-hissatsu.c (100%) rename src/{ => realm}/realm-hissatsu.h (100%) rename src/{ => realm}/realm-life.c (100%) rename src/{ => realm}/realm-life.h (100%) rename src/{ => realm}/realm-nature.c (100%) rename src/{ => realm}/realm-nature.h (100%) rename src/{ => realm}/realm-song.c (100%) rename src/{ => realm}/realm-song.h (100%) rename src/{ => realm}/realm-sorcery.c (100%) rename src/{ => realm}/realm-sorcery.h (100%) rename src/{ => realm}/realm-trump.c (100%) rename src/{ => realm}/realm-trump.h (100%) rename src/{ => realm}/realm.c (100%) rename src/{ => realm}/realm.h (100%) diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index 8e1c8f666..c827dc03e 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -297,14 +297,14 @@ - - - - - - - - + + + + + + + + @@ -375,12 +375,12 @@ - - - - - - + + + + + + @@ -575,20 +575,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index 3da005dc5..b9c1e6a23 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -142,45 +142,6 @@ player - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - spell @@ -301,9 +262,6 @@ io - - spell - creature @@ -697,6 +655,48 @@ spell + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + @@ -830,45 +830,6 @@ player - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - - - spell - spell @@ -974,9 +935,6 @@ cmd - - spell - io @@ -1397,6 +1355,48 @@ spell + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + + + realm + @@ -1457,6 +1457,9 @@ {4e443fe1-9ff8-4786-b43f-7e4d106760dc} + + {c4ce5c0c-f907-4e62-abc1-5d9dbe7f1abf} + diff --git a/src/Makefile.am b/src/Makefile.am index 564870b62..fe9120949 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -139,13 +139,20 @@ hengband_SOURCES = \ quest.h quest.c\ \ racial.c racial.h \ - realm.c realm.h \ - realm-arcane.c realm-arcane.h realm-chaos.c realm-chaos.h \ - realm-craft.c realm-craft.h realm-crusade.c realm-crusade.h \ - realm-daemon.c realm-daemon.h realm-death.c realm-death.h \ - realm-hex.c realm-hex.h realm-hissatsu.c realm-hissatsu.h \ - realm-life.c realm-life.h realm-nature.c realm-nature.h realm-song.c \ - realm-song.h realm-sorcery.c realm-sorcery.h realm-trump.c realm-trump.h \ + realm/realm.c realm/realm.h \ + realm/realm-arcane.c realm/realm-arcane.h \ + realm/realm-chaos.c realm/realm-chaos.h \ + realm/realm-craft.c realm/realm-craft.h \ + realm/realm-crusade.c realm/realm-crusade.h \ + realm/realm-daemon.c realm/realm-daemon.h \ + realm/realm-death.c realm/realm-death.h \ + realm/realm-hex.c realm/realm-hex.h + realm/realm-hissatsu.c realm/realm-hissatsu.h \ + realm/realm-life.c realm/realm-life.h + realm/realm-nature.c realm/realm-nature.h realm/realm-song.c \ + realm/realm-song.h realm/realm-sorcery.c \ + 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 \ diff --git a/src/realm-arcane.c b/src/realm/realm-arcane.c similarity index 100% rename from src/realm-arcane.c rename to src/realm/realm-arcane.c diff --git a/src/realm-arcane.h b/src/realm/realm-arcane.h similarity index 100% rename from src/realm-arcane.h rename to src/realm/realm-arcane.h diff --git a/src/realm-chaos.c b/src/realm/realm-chaos.c similarity index 100% rename from src/realm-chaos.c rename to src/realm/realm-chaos.c diff --git a/src/realm-chaos.h b/src/realm/realm-chaos.h similarity index 100% rename from src/realm-chaos.h rename to src/realm/realm-chaos.h diff --git a/src/realm-craft.c b/src/realm/realm-craft.c similarity index 100% rename from src/realm-craft.c rename to src/realm/realm-craft.c diff --git a/src/realm-craft.h b/src/realm/realm-craft.h similarity index 100% rename from src/realm-craft.h rename to src/realm/realm-craft.h diff --git a/src/realm-crusade.c b/src/realm/realm-crusade.c similarity index 100% rename from src/realm-crusade.c rename to src/realm/realm-crusade.c diff --git a/src/realm-crusade.h b/src/realm/realm-crusade.h similarity index 100% rename from src/realm-crusade.h rename to src/realm/realm-crusade.h diff --git a/src/realm-daemon.c b/src/realm/realm-daemon.c similarity index 100% rename from src/realm-daemon.c rename to src/realm/realm-daemon.c diff --git a/src/realm-daemon.h b/src/realm/realm-daemon.h similarity index 100% rename from src/realm-daemon.h rename to src/realm/realm-daemon.h diff --git a/src/realm-death.c b/src/realm/realm-death.c similarity index 100% rename from src/realm-death.c rename to src/realm/realm-death.c diff --git a/src/realm-death.h b/src/realm/realm-death.h similarity index 100% rename from src/realm-death.h rename to src/realm/realm-death.h diff --git a/src/realm-hex.c b/src/realm/realm-hex.c similarity index 100% rename from src/realm-hex.c rename to src/realm/realm-hex.c diff --git a/src/realm-hex.h b/src/realm/realm-hex.h similarity index 100% rename from src/realm-hex.h rename to src/realm/realm-hex.h diff --git a/src/realm-hissatsu.c b/src/realm/realm-hissatsu.c similarity index 100% rename from src/realm-hissatsu.c rename to src/realm/realm-hissatsu.c diff --git a/src/realm-hissatsu.h b/src/realm/realm-hissatsu.h similarity index 100% rename from src/realm-hissatsu.h rename to src/realm/realm-hissatsu.h diff --git a/src/realm-life.c b/src/realm/realm-life.c similarity index 100% rename from src/realm-life.c rename to src/realm/realm-life.c diff --git a/src/realm-life.h b/src/realm/realm-life.h similarity index 100% rename from src/realm-life.h rename to src/realm/realm-life.h diff --git a/src/realm-nature.c b/src/realm/realm-nature.c similarity index 100% rename from src/realm-nature.c rename to src/realm/realm-nature.c diff --git a/src/realm-nature.h b/src/realm/realm-nature.h similarity index 100% rename from src/realm-nature.h rename to src/realm/realm-nature.h diff --git a/src/realm-song.c b/src/realm/realm-song.c similarity index 100% rename from src/realm-song.c rename to src/realm/realm-song.c diff --git a/src/realm-song.h b/src/realm/realm-song.h similarity index 100% rename from src/realm-song.h rename to src/realm/realm-song.h diff --git a/src/realm-sorcery.c b/src/realm/realm-sorcery.c similarity index 100% rename from src/realm-sorcery.c rename to src/realm/realm-sorcery.c diff --git a/src/realm-sorcery.h b/src/realm/realm-sorcery.h similarity index 100% rename from src/realm-sorcery.h rename to src/realm/realm-sorcery.h diff --git a/src/realm-trump.c b/src/realm/realm-trump.c similarity index 100% rename from src/realm-trump.c rename to src/realm/realm-trump.c diff --git a/src/realm-trump.h b/src/realm/realm-trump.h similarity index 100% rename from src/realm-trump.h rename to src/realm/realm-trump.h diff --git a/src/realm.c b/src/realm/realm.c similarity index 100% rename from src/realm.c rename to src/realm/realm.c diff --git a/src/realm.h b/src/realm/realm.h similarity index 100% rename from src/realm.h rename to src/realm/realm.h -- 2.11.0