[Refactor] #39963 Changed header inclusion from realm*.h to realm/realm*.h

diff --git a/src/avatar.c b/src/avatar.c
index 86a2f54..ab1e3a2 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -15,7 +15,7 @@
 
 #include "angband.h"
 #include "avatar.h"
-#include "realm.h"
+#include "realm/realm.h"
 #include "player-race.h"
 #include "player-class.h"
 

diff --git a/src/birth.c b/src/birth.c
index 95f47fc..1a17aa6 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -55,7 +55,7 @@
 #include "monsterrace.h"
 #include "autopick/autopick.h"
 #include "save.h"
-#include "realm.h"
+#include "realm/realm.h"
 #include "japanese.h"
 #include "view/display-main-window.h" // 暫定。後で消す.
 

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 7544007..80f1c34 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -21,7 +21,7 @@
 #include "spells-object.h"
 #include "spells-floor.h"
 #include "player-effects.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "player-damage.h"
 #include "player-inventory.h"
 #include "monster-status.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 4cb6eb0..0476725 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -29,7 +29,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "geometry.h"
 #include "wild.h"
 #include "grid.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index d853aab..5a70d44 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -15,7 +15,7 @@
 #include "object-hook.h"
 #include "avatar.h"
 #include "spells-status.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-damage.h"

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 37b2143..4272752 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -22,7 +22,7 @@
 #include "player-damage.h"
 #include "player/mimic-info-table.h"
 #include "player-inventory.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "spells-floor.h"
 #include "object-broken.h"
 #include "cmd-basic.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 9a76a8e..5a2d3bc 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -20,7 +20,7 @@
 #include "player-effects.h"
 #include "player-inventory.h"
 #include "rumor.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 
 #include "spells.h"
 #include "spells-object.h"

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index cc18517..fe01443 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -18,7 +18,7 @@
 #include "spell/spells-common.h"
 #include "spells.h"
 #include "spells-summon.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "mind.h"
 #include "avatar.h"
 #include "player-damage.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 00e24fe..cb79ad5 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -24,8 +24,8 @@
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "avatar.h"
-#include "realm-hex.h"
-#include "realm-song.h"
+#include "realm/realm-hex.h"
+#include "realm/realm-song.h"
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "grid.h"

diff --git a/src/core.c b/src/core.c
index a7c44c5..903ad94 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -87,7 +87,7 @@
 #include "player-damage.h"
 #include "player-effects.h"
 #include "cmd-spell.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "object/object-kind.h"
 #include "object-hook.h"
 #include "wild.h"
@@ -110,8 +110,8 @@
 #include "autopick/autopick-pref-processor.h"
 #include "autopick/autopick-reader-writer.h"
 #include "save.h"
-#include "realm.h"
-#include "realm-song.h"
+#include "realm/realm.h"
+#include "realm/realm-song.h"
 #include "targeting.h"
 
  /*!

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 042227a..8fd5c83 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -55,7 +55,7 @@
 #include "object-ego.h"
 #include "monsterrace.h"
 #include "floor-town.h"
-#include "realm.h"
+#include "realm/realm.h"
 
 #include "trap.h"
 #include "artifact.h"

diff --git a/src/grid.c b/src/grid.c
index c7cfe9c..e8c5bdd 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -36,7 +36,7 @@
 #include "player-class.h"
 #include "spells.h"
 #include "view/display-main-window.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 
 #define MONSTER_FLOW_DEPTH 32 /*!< 敵のプレイヤーに対する移動道のりの最大値(この値以上は処理を打ち切る) / OPTION: Maximum flow depth when using "MONSTER_FLOW" */
 

diff --git a/src/market/building.c b/src/market/building.c
index 5e4fce4..3c002d3 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -46,7 +46,7 @@
 #include "spells.h"
 #include "spells-object.h"
 #include "spells-status.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "dungeon-file.h"
 
 #include "files.h"

diff --git a/src/market/building.h b/src/market/building.h
index db490d0..140fd0c 100644 (file)
--- a/src/market/building.h
+++ b/src/market/building.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "realm.h"
+#include "realm/realm.h"
 #include "player-race.h"
 #include "player/race-info-table.h"
 #include "player-class.h"

diff --git a/src/mind.c b/src/mind.c
index ebbc1b6..fd97609 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -40,7 +40,7 @@
 #include "player-damage.h"
 #include "view/display-main-window.h"
 #include "targeting.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/monster-process.c b/src/monster-process.c
index 447c4a8..04d060c 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -29,7 +29,7 @@
 #include "melee.h"
 #include "spells-summon.h"
 #include "avatar.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "feature.h"
 #include "grid.h"
 #include "player-move.h"

diff --git a/src/mspells1.c b/src/mspells1.c
index 62243e6..90f51e2 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -46,14 +46,14 @@
 #include "grid.h"
 #include "object-curse.h"
 #include "quest.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "player-move.h"
 #include "player-status.h"
 #include "monster.h"
 #include "monster-spell.h"
 #include "spells.h"
 #include "world.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "view/display-main-window.h"
 #include "player-race.h"
 #include "player-class.h"

diff --git a/src/mspells2.c b/src/mspells2.c
index 4f8a949..1ad0a1a 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -19,7 +19,7 @@
 #include "floor.h"
 #include "grid.h"
 #include "quest.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "player-move.h"
 #include "player-class.h"
 #include "monster.h"

diff --git a/src/mspells4.c b/src/mspells4.c
index 4171dcb..413f373 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -17,7 +17,7 @@
 #include "player-class.h"
 #include "player-personality.h"
 #include "player-damage.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "player-move.h"
 #include "monster-spell.h"
 #include "monster-status.h"

diff --git a/src/player-damage.c b/src/player-damage.c
index ad98771..71cdc56 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -11,7 +11,7 @@
 #include "autopick/autopick-pref-processor.h"
 #include "cmd/cmd-process-screen.h"
 #include "market/arena-info-table.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "floor.h"
 #include "artifact.h"
 #include "object-flavor.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 2072f8e..d7e6cfc 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -29,8 +29,8 @@
 #include "quest.h"
 #include "avatar.h"
 #include "spells-status.h"
-#include "realm-song.h"
-#include "realm-hex.h"
+#include "realm/realm-song.h"
+#include "realm/realm-hex.h"
 #include "object-ego.h"
 #include "object-hook.h"
 #include "wild.h"

diff --git a/src/player-move.c b/src/player-move.c
index 120aaeb..1bd4d66 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -144,7 +144,7 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "autopick/autopick.h"
 #include "dungeon.h"
 #include "floor.h"

diff --git a/src/player-status.c b/src/player-status.c
index 6b3f279..12778a8 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -29,8 +29,8 @@
 #include "monsterrace-hook.h"
 #include "mutation.h"
 #include "patron.h"
-#include "realm-hex.h"
-#include "realm-song.h"
+#include "realm/realm-hex.h"
+#include "realm/realm-song.h"
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-spell.h"
 #include "dungeon.h"

diff --git a/src/player/temporary-resistances.c b/src/player/temporary-resistances.c
index 952c690..03aee5e 100644 (file)
--- a/src/player/temporary-resistances.c
+++ b/src/player/temporary-resistances.c
@@ -1,6 +1,6 @@
 #include "temporary-resistances.h"
-#include "realm-hex.h"
-#include "realm-song.h"
+#include "realm/realm-hex.h"
+#include "realm/realm-song.h"
 
 /*!
  * @brief プレイヤーの一時的魔法効果による耐性を返す

diff --git a/src/racial.c b/src/racial.c
index 34090a2..1449825 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -32,7 +32,7 @@
 #include "spells-floor.h"
 #include "spells.h"
 #include "cmd-spell.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "player-class.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 3934420..4965da4 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -30,11 +30,11 @@
 #include "player-effects.h"
 #include "player-skill.h"
 #include "player-inventory.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "grid.h"
 #include "monsterrace.h"
 #include "targeting.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "view/display-main-window.h"
 #include "world.h"
 

diff --git a/src/realm/realm-hex.h b/src/realm/realm-hex.h
index 5285762..ff7b343 100644 (file)
--- a/src/realm/realm-hex.h
+++ b/src/realm/realm-hex.h
@@ -1,5 +1,5 @@
 /*!
- * @file realm-hex.h
+ * @file realm/realm-hex.h
  */
 
 #define hex_spelling_any(CREATURE_PTR) \

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 945df07..43481c8 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
-#include "realm-song.h"
+#include "realm/realm-song.h"
 
 #include "cmd-spell.h"
 #include "spells.h"

diff --git a/src/realm/realm-trump.h b/src/realm/realm-trump.h
index 61b359f..30b69b2 100644 (file)
--- a/src/realm/realm-trump.h
+++ b/src/realm/realm-trump.h
@@ -1 +1,3 @@
-extern concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode);
+#pragma once
+
+extern concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode);

diff --git a/src/realm/realm.c b/src/realm/realm.c
index bb4cbfc..1e070ff 100644 (file)
--- a/src/realm/realm.c
+++ b/src/realm/realm.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "realm.h"
+#include "realm/realm.h"
 
 #ifdef JP
 /*!

diff --git a/src/selfinfo.c b/src/selfinfo.c
index 1524bc0..13c8389 100644 (file)
--- a/src/selfinfo.c
+++ b/src/selfinfo.c
@@ -21,9 +21,9 @@
 #include "player-race.h"
 #include "player-class.h"
 #include "avatar.h"
-#include "realm.h"
-#include "realm-hex.h"
-#include "realm-song.h"
+#include "realm/realm.h"
+#include "realm/realm-hex.h"
+#include "realm/realm-song.h"
 
 /*!
  * @brief 自己分析処理(Nethackからのアイデア) / self-knowledge... idea from nethack.

diff --git a/src/spells-status.c b/src/spells-status.c
index 2f298f2..f5e4acb 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -15,7 +15,7 @@
 #include "player-effects.h"
 #include "object/object-kind.h"
 #include "targeting.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/spells.h b/src/spells.h
index 7644fe9..c547190 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "realm.h"
+#include "realm/realm.h"
 
 #define SPELL_NAME   0
 #define SPELL_DESC   1

diff --git a/src/spells1.c b/src/spells1.c
index a65e743..47d34fd 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -49,20 +49,20 @@
 #include "feature.h"
 #include "view/display-main-window.h"
 
-#include "realm.h"
-#include "realm-arcane.h"
-#include "realm-chaos.h"
-#include "realm-craft.h"
-#include "realm-crusade.h"
-#include "realm-daemon.h"
-#include "realm-death.h"
-#include "realm-hex.h"
-#include "realm-hissatsu.h"
-#include "realm-life.h"
-#include "realm-nature.h"
-#include "realm-song.h"
-#include "realm-sorcery.h"
-#include "realm-trump.h"
+#include "realm/realm.h"
+#include "realm/realm-arcane.h"
+#include "realm/realm-chaos.h"
+#include "realm/realm-craft.h"
+#include "realm/realm-crusade.h"
+#include "realm/realm-daemon.h"
+#include "realm/realm-death.h"
+#include "realm/realm-hex.h"
+#include "realm/realm-hissatsu.h"
+#include "realm/realm-life.h"
+#include "realm/realm-nature.h"
+#include "realm/realm-song.h"
+#include "realm/realm-sorcery.h"
+#include "realm/realm-trump.h"
 
 #include "effect/effect-feature.h"
 #include "effect/effect-item.h"

diff --git a/src/spells2.c b/src/spells2.c
index 2847d5b..1040f5a 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -37,7 +37,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "spells-diceroll.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "autopick/autopick.h"
 #include "object-flavor.h"
 #include "object-hook.h"
@@ -57,7 +57,7 @@
 #include "object/object-kind.h"
 #include "monsterrace.h"
 #include "targeting.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "english.h"
 
  /*!

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 2295a2f..25f5e12 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -35,8 +35,8 @@
 #include "view/display-main-window.h"
 
 #include "spells.h"
-#include "realm-hex.h"
-#include "realm-song.h"
+#include "realm/realm-hex.h"
+#include "realm/realm-song.h"
 
 #include "object-flavor.h"
 

diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c
index 7d62bfb..0d836ac 100644 (file)
--- a/src/view/display-player-middle.c
+++ b/src/view/display-player-middle.c
@@ -3,7 +3,7 @@
 #include "view/display-util.h"
 #include "player-effects.h"
 #include "player-skill.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "world.h"
 #include "object/object-kind.h"
 #include "object-hook.h"

diff --git a/src/wild.c b/src/wild.c
index 1e70143..175eb23 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -19,7 +19,7 @@
 #include "wild.h"
 #include "world.h"
 #include "monster.h"
-#include "realm-hex.h"
+#include "realm/realm-hex.h"
 #include "player-status.h"
 #include "player-effects.h"
 #include "grid.h"
@@ -30,7 +30,7 @@
 #include "files.h"
 #include "feature.h"
 #include "floor-town.h"
-#include "realm.h"
+#include "realm/realm.h"
 
 #include "view/display-main-window.h"