[Refactor] #40399 angband.h からobject2.hのインクルード を*抹殺*した / *Genocide* inclusion object2...

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index 9e22ac5..ce31f21 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -8,6 +8,7 @@
 #include "autopick-methods-table.h"
 #include "autopick/autopick-destroyer.h"
 #include "object/sv-other-types.h"
+#include "object/object2.h"
 #include "object/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c
index b82160c..151fa03 100644 (file)
--- a/src/autopick/autopick-matcher.c
+++ b/src/autopick/autopick-matcher.c
@@ -10,6 +10,7 @@
 #include "autopick/autopick-flags-table.h"
 #include "autopick/autopick-matcher.h"
 #include "object/item-feeling.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 373141e..d338673 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -19,6 +19,7 @@
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick.h"
 #include "player/player-move.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 

diff --git a/src/autopick/autopick.h b/src/autopick/autopick.h
index cc580cf..aaf8952 100644 (file)
--- a/src/autopick/autopick.h
+++ b/src/autopick/autopick.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "autopick/autopick-util.h"
+#include "grid/grid.h"
 
 extern void autopick_alter_item(player_type *player_ptr, INVENTORY_IDX item, bool destroy);
 extern void autopick_delayed_alter(player_type *player_ptr);

diff --git a/src/birth/game-play-initializer.c b/src/birth/game-play-initializer.c
index fa038d3..01a12a1 100644 (file)
--- a/src/birth/game-play-initializer.c
+++ b/src/birth/game-play-initializer.c
@@ -1,5 +1,6 @@
 #include "system/angband.h"
 #include "birth/game-play-initializer.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "world/world.h"
 #include "dungeon/quest.h"

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index aaa0ba9..7a1c25d 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -4,6 +4,7 @@
 #include "player/player-personalities-table.h"
 #include "birth/initial-equipments-table.h"
 #include "object/item-apply-magic.h"
+#include "object/object2.h"
 #include "object/object-ego.h"
 #include "object/object-kind.h"
 #include "object/sv-bow-types.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 2e5a66f..f8998f5 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -8,12 +8,12 @@
 
 #include "system/angband.h"
 #include "main/sound-definitions-table.h"
-
 #include "cmd/cmd-activate.h"
 #include "cmd/cmd-basic.h"
 #include "cmd/cmd-save.h"
 #include "object/object-hook.h"
 #include "core/sort.h"
+#include "floor/floor.h"
 #include "object/artifact.h"
 #include "object/item-use-flags.h"
 #include "player/avatar.h"

diff --git a/src/cmd/cmd-attack.c b/src/cmd/cmd-attack.c
index a5a5459..cab9675 100644 (file)
--- a/src/cmd/cmd-attack.c
+++ b/src/cmd/cmd-attack.c
@@ -14,6 +14,7 @@
 #include "monster/monster-status.h"
 #include "object/artifact.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 9ea3138..d82a82a 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -29,6 +29,7 @@
 #include "monster/monster-status.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"
+#include "object/object2.h"
 #include "player/avatar.h"
 #include "player/player-status.h"
 #include "realm/realm-hex.h"

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index fe604e0..e7e9f89 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -33,6 +33,7 @@
 #include "system/angband.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/dump-util.h"
+#include "floor/floor.h"
 #include "term/gameterm.h"
 #include "system/angband-version.h"
 #include "io/dump-remover.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index 61a48fe..5f56576 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -10,7 +10,7 @@
 #include "system/angband.h"
 #include "main/sound-definitions-table.h"
 #include "util/util.h"
-
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "player/avatar.h"

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 1541b06..7672d95 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -17,16 +17,16 @@
 #include "term/gameterm.h"
 
 #include "player/selfinfo.h"
-#include "cmd-activate.h"
-#include "cmd-eat.h"
-#include "cmd-quaff.h"
-#include "cmd-read.h"
-#include "cmd-usestaff.h"
-#include "cmd-zaprod.h"
-#include "cmd-zapwand.h"
-#include "cmd-pet.h"
-#include "cmd-basic.h"
-
+#include "cmd/cmd-activate.h"
+#include "cmd/cmd-eat.h"
+#include "cmd/cmd-quaff.h"
+#include "cmd/cmd-read.h"
+#include "cmd/cmd-usestaff.h"
+#include "cmd/cmd-zaprod.h"
+#include "cmd/cmd-zapwand.h"
+#include "cmd/cmd-pet.h"
+#include "cmd/cmd-basic.h"
+#include "object/object2.h"
 #include "object/item-feeling.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/cmd/cmd-knowledge.c b/src/cmd/cmd-knowledge.c
index f9a5e2a..0b215a0 100644 (file)
--- a/src/cmd/cmd-knowledge.c
+++ b/src/cmd/cmd-knowledge.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "cmd/cmd-knowledge.h"
 #include "cmd/cmd-draw.h"
+#include "grid/feature.h"
 #include "knowledge/knowledge-autopick.h"
 #include "knowledge/knowledge-experiences.h"
 #include "knowledge/knowledge-features.h"

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index 6114374..f602ff8 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -57,15 +57,16 @@
 #include "main/sound-definitions-table.h"
 #include "term/gameterm.h"
 
-#include "cmd-basic.h"
-#include "cmd-usestaff.h"
-#include "cmd-zaprod.h"
-#include "cmd-zapwand.h"
-#include "cmd-magiceat.h"
+#include "cmd/cmd-basic.h"
+#include "cmd/cmd-usestaff.h"
+#include "cmd/cmd-zaprod.h"
+#include "cmd/cmd-zapwand.h"
+#include "cmd/cmd-magiceat.h"
 #include "player/avatar.h"
 #include "player/player-status.h"
 #include "spell/spells3.h"
 #include "player/player-class.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/sv-other-types.h"
 #include "object/sv-rod-types.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index 5df404b..8a34a0b 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -5,7 +5,6 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "floor/floor.h"
-#include "grid/grid.h"
 #include "core/sort.h"
 #include "player/player-move.h"
 #include "player/player-status.h"

diff --git a/src/cmd/cmd-pet.h b/src/cmd/cmd-pet.h
index 0141d17..b870bd7 100644 (file)
--- a/src/cmd/cmd-pet.h
+++ b/src/cmd/cmd-pet.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "grid/grid.h"
+
 extern bool do_cmd_riding(player_type *creature_ptr, bool force);
 extern void do_cmd_pet_dismiss(player_type *creature_pt);
 extern void do_cmd_pet(player_type *creature_ptr);

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 32e9e0f..2302d2c 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -24,6 +24,7 @@
 #include "realm/realm-hex.h"
 #include "spell/spells-floor.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-broken.h"
 #include "object/sv-potion-types.h"
 #include "cmd-basic.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index a884ac1..0f32b6c 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -32,6 +32,7 @@
 #include "core/show-file.h"
 #include "io/files-util.h"
 #include "floor/floor.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/sv-scroll-types.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index 3d3c75e..96dca56 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -1,8 +1,8 @@
 #include "system/angband.h"
 #include "util/util.h"
 #include "term/gameterm.h"
-
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index 66edb25..cd49f0b 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -12,6 +12,7 @@
 #include "spell/spells3.h"
 #include "spell/spells-status.h"
 #include "spell/spells-floor.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"
 #include "floor/floor.h"

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index 492e357..56074c5 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -5,6 +5,7 @@
 #include "knowledge/knowledge-items.h"
 #include "knowledge/knowledge-monsters.h"
 #include "io/files-util.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "term/gameterm.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index ab93e6b..d5c99e9 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -8,6 +8,7 @@
 #include "player/player-class.h"
 #include "inventory/player-inventory.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 6fa58d2..f9f855a 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -10,6 +10,7 @@
 #include "player/player-class.h"
 #include "inventory/player-inventory.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"

diff --git a/src/cmd/dump-util.c b/src/cmd/dump-util.c
index 2e94552..40865b4 100644 (file)
--- a/src/cmd/dump-util.c
+++ b/src/cmd/dump-util.c
@@ -1,5 +1,4 @@
 #include "system/angband.h"
-#include "grid/feature.h"
 #include "dump-util.h"
 #include "term/gameterm.h"
 

diff --git a/src/cmd/dump-util.h b/src/cmd/dump-util.h
index 329a4aa..ea2e968 100644 (file)
--- a/src/cmd/dump-util.h
+++ b/src/cmd/dump-util.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "grid/feature.h"
+
 #define FILE_NAME_SIZE 1024
 
 // Clipboard variables for copy&paste in visual mode

diff --git a/src/cmd/lighting-level-table.c b/src/cmd/lighting-level-table.c
index 6949b08..0624f07 100644 (file)
--- a/src/cmd/lighting-level-table.c
+++ b/src/cmd/lighting-level-table.c
@@ -1,6 +1,5 @@
 #include "system/angband.h"
 #include "cmd/lighting-level-table.h"
-#include "grid/feature.h"
 
 /*!
  * @brief キャラクタ色の明暗表現

diff --git a/src/cmd/lighting-level-table.h b/src/cmd/lighting-level-table.h
index 26328cc..705b8a2 100644 (file)
--- a/src/cmd/lighting-level-table.h
+++ b/src/cmd/lighting-level-table.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "grid/feature.h"
+
 extern concptr lighting_level_str[F_LIT_MAX];

diff --git a/src/combat/attack-accuracy.c b/src/combat/attack-accuracy.c
index 6f0ba62..adcdea0 100644 (file)
--- a/src/combat/attack-accuracy.c
+++ b/src/combat/attack-accuracy.c
@@ -1,5 +1,4 @@
-#include "system/angband.h"
-#include "combat/attack-accuracy.h"
+#include "combat/attack-accuracy.h"
 #include "main/sound-definitions-table.h"
 #include "object/death-scythe.h"
 #include "object/sv-weapon-types.h"

diff --git a/src/combat/attack-accuracy.h b/src/combat/attack-accuracy.h
index e673d9a..810f721 100644 (file)
--- a/src/combat/attack-accuracy.h
+++ b/src/combat/attack-accuracy.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "system/angband.h"
 #include "combat/player-attack-util.h"
 
 bool test_hit_norm(player_type *attacker_ptr, HIT_RELIABILITY chance, ARMOUR_CLASS ac, bool visible);

diff --git a/src/combat/attack-chaos-effect.c b/src/combat/attack-chaos-effect.c
index b45d228..3de0acd 100644 (file)
--- a/src/combat/attack-chaos-effect.c
+++ b/src/combat/attack-chaos-effect.c
@@ -8,6 +8,7 @@
 #include "combat/attack-chaos-effect.h"
 #include "monster/monster-status.h"
 #include "object/artifact.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"
 #include "realm/realm-hex.h"

diff --git a/src/combat/monster-attack-monster.c b/src/combat/monster-attack-monster.c
index 404a44a..53d390d 100644 (file)
--- a/src/combat/monster-attack-monster.c
+++ b/src/combat/monster-attack-monster.c
@@ -2,6 +2,7 @@
 #include "dungeon/dungeon.h"
 #include "combat/monster-attack-effect.h"
 #include "combat/hallucination-attacks-table.h"
+#include "floor/floor.h"
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/combat/monster-attack-player.c b/src/combat/monster-attack-player.c
index 2416a5b..81e1e9c 100644 (file)
--- a/src/combat/monster-attack-player.c
+++ b/src/combat/monster-attack-player.c
@@ -18,6 +18,7 @@
 #include "main/sound-definitions-table.h"
 #include "mind/racial-mirror-master.h"
 #include "monster/monster-status.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"

diff --git a/src/combat/player-attack-util.h b/src/combat/player-attack-util.h
index 6963243..d0b5abf 100644 (file)
--- a/src/combat/player-attack-util.h
+++ b/src/combat/player-attack-util.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "grid/grid.h"
 #include "combat/combat-options-type.h"
 #include "combat/martial-arts-table.h"
 

diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c
index 224b575..fbd5bbe 100644 (file)
--- a/src/combat/player-attack.c
+++ b/src/combat/player-attack.c
@@ -13,6 +13,7 @@
 #include "combat/player-attack-util.h"
 #include "combat/slaying.h"
 #include "combat/vorpal-weapon.h"
+#include "floor/floor.h"
 #include "main/sound-definitions-table.h"
 #include "mind/monk-attack.h"
 #include "mind/racial-samurai.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 4d98e0e..a418037 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -13,6 +13,7 @@
 #include "player/player-skill.h"
 #include "player/player-class.h"
 #include "player/player-personalities-table.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"
 #include "object/object-mark-types.h"

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index f539f8f..4f30a08 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -3,6 +3,7 @@
 #include "object/artifact.h"
 #include "realm/realm-hex.h"
 #include "mind/samurai-slaying.h"
+#include "object/object2.h"
 #include "object/tr-types.h"
 
 /*!

diff --git a/src/combat/snipe.c b/src/combat/snipe.c
index f35c1ec..a214c46 100644 (file)
--- a/src/combat/snipe.c
+++ b/src/combat/snipe.c
@@ -15,6 +15,7 @@
 #include "player/player-status.h"
 #include "cmd-basic.h"
 #include "combat/snipe.h"
+#include "floor/floor.h"
 #include "monster/monster-race.h"
 #include "view/display-main-window.h"
 

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 9365836..38b3c81 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -1,5 +1,7 @@
 #include "system/angband.h"
 #include "core/hp-mp-processor.h"
+#include "floor/floor.h"
+#include "grid/feature.h"
 #include "realm/realm-song.h"
 #include "player/player-damage.h"
 #include "object/object-flavor.h"

diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c
index 29acf34..2b54995 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-magiceat.h"
+#include "floor/floor.h"
 #include "monster/monster-status.h"
 
 /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/

diff --git a/src/core/turn-compensator.c b/src/core/turn-compensator.c
index fd4e925..fdcbcb5 100644 (file)
--- a/src/core/turn-compensator.c
+++ b/src/core/turn-compensator.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "core/turn-compensator.h"
 #include "world/world.h"
+#include "floor/floor.h"
 #include "floor/floor-town.h"
 #include "store/store-owners.h"
 #include "store/store-util.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 2172a8f..5be74c4 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -70,6 +70,7 @@
 
 #include "main/init.h"
 #include "object/tr-types.h"
+#include "object/object2.h"
 
 dungeon_grid letter[255];
 

diff --git a/src/dungeon/dungeon.c b/src/dungeon/dungeon.c
index 4d19e84..233656c 100644 (file)
--- a/src/dungeon/dungeon.c
+++ b/src/dungeon/dungeon.c
@@ -1,5 +1,4 @@
-#include "system/angband.h"
-#include "dungeon/dungeon.h"
+#include "dungeon/dungeon.h"
 #include "world/world.h"
 
 /*

diff --git a/src/dungeon/dungeon.h b/src/dungeon/dungeon.h
index dfd4466..bf0a136 100644 (file)
--- a/src/dungeon/dungeon.h
+++ b/src/dungeon/dungeon.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "system/angband.h"
+#include "grid/feature.h"
+
 #define DUNGEON_FEAT_PROB_NUM 3
 
 #define DUNGEON_ANGBAND  1

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 8ab7939..f9c786b 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -15,6 +15,7 @@
 #include "player/player-personalities-table.h"
 #include "object/artifact.h"
 #include "object/item-apply-magic.h"
+#include "object/object2.h"
 #include "grid/feature.h"
 #include "world/world.h"
 #include "io/write-diary.h"

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index 4192423..0301abf 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -3,6 +3,8 @@
 #include "room/rooms.h"
 #include "dungeon/dungeon.h"
 #include "main/sound-definitions-table.h"
+#include "floor/floor.h"
+#include "grid/grid.h"
 #include "grid/trap.h"
 #include "player/player-effects.h"
 #include "world/world.h"

diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index 1318d3e..b55d2b7 100644 (file)
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -1,5 +1,6 @@
 #include "system/angband.h"
 #include "effect-item.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index 823ef0b..ef8b4dc 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-domination.h"
+#include "floor/floor.h"
 #include "player/player-effects.h"
 #include "spell/spells-diceroll.h"
 #include "monster/monster-status.h"

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index 44bace9..01781da 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-oldies.h"
+#include "floor/floor.h"
 #include "player/avatar.h"
 #include "monster/monster-status.h"
 

diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c
index 657fc4f..5ed19cf 100644 (file)
--- a/src/effect/effect-monster-psi.c
+++ b/src/effect/effect-monster-psi.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-psi.h"
+#include "floor/floor.h"
 #include "player/player-damage.h"
 #include "mind/racial-mirror-master.h"
 #include "world/world.h"

diff --git a/src/effect/effect-monster-util.c b/src/effect/effect-monster-util.c
index bcddf46..aa67ab9 100644 (file)
--- a/src/effect/effect-monster-util.c
+++ b/src/effect/effect-monster-util.c
@@ -6,6 +6,7 @@
 
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
+#include "floor/floor.h"
 
 /*!
  * @brief affect_monster() に亘ってきた引数をeffect_monster_type構造体に代入する

diff --git a/src/effect/effect-monster-util.h b/src/effect/effect-monster-util.h
index ec1b6b0..aef6fc7 100644 (file)
--- a/src/effect/effect-monster-util.h
+++ b/src/effect/effect-monster-util.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "grid/grid.h"
+
 typedef struct effect_monster_type {
        grid_type *g_ptr;
        monster_type *m_ptr;

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 61ae84f..a29b36a 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -18,6 +18,7 @@
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"
 #include "spell/spells3.h"
+#include "object/object2.h"
 #include "object/special-object-flags.h"
 #include "object/sv-other-types.h"
 

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 2ab26f3..00e4464 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -15,6 +15,7 @@
 #include "player/player-move.h"
 #include "world/world.h"
 #include "player/player-effects.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "object/sv-amulet-types.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index e420ead..e983003 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -30,6 +30,7 @@
 #include "floor/wild.h"
 #include "spell/spells-floor.h"
 #include "monster/monster-status.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "cmd-pet.h"
 #include "cmd-basic.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 6ae8feb..9560463 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -26,13 +26,13 @@
 #include "grid/grid.h"
 #include "monster/monster.h"
 #include "grid/feature.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "spell/spells1.h"
 #include "spell/spells-floor.h"
 #include "room/rooms.h"
 
-
 /*!
  * @brief 再帰フラクタルアルゴリズムによりダンジョン内に川を配置する /
  * Recursive fractal algorithm to place water through the dungeon.

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 989a27b..d072639 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -10,6 +10,7 @@
 #include "world/world.h"
 #include "player/player-effects.h"
 #include "object/object1.h"
+#include "object/object2.h"
 #include "object/artifact.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"

diff --git a/src/floor/wild.c b/src/floor/wild.c
index 3dbeba6..d3b7b2f 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -15,7 +15,6 @@
 #include "system/system-variables.h"
 
 #include "dungeon/dungeon.h"
-#include "floor/floor.h"
 #include "floor/wild.h"
 #include "world/world.h"
 #include "monster/monster.h"

diff --git a/src/floor/wild.h b/src/floor/wild.h
index 225e55c..2ec417d 100644 (file)
--- a/src/floor/wild.h
+++ b/src/floor/wild.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "floor/floor.h"
+
 #define NO_TOWN 6
 #define SECRET_TOWN 5
 

diff --git a/src/inventory/inventory-damage.c b/src/inventory/inventory-damage.c
index 2bd9f69..ed8a837 100644 (file)
--- a/src/inventory/inventory-damage.c
+++ b/src/inventory/inventory-damage.c
@@ -1,5 +1,6 @@
 #include "system/angband.h"
 #include "inventory/inventory-damage.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/artifact.h"
 #include "object/object-hook.h"

diff --git a/src/inventory/pack-overflow.c b/src/inventory/pack-overflow.c
index cea9ad8..1403362 100644 (file)
--- a/src/inventory/pack-overflow.c
+++ b/src/inventory/pack-overflow.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "inventory/pack-overflow.h"
 #include "player/player-move.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "core/stuff-handler.h"
 

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 6d13f3f..5911bac 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -7,6 +7,7 @@
 #include "object/sv-other-types.h"
 #include "object/item-use-flags.h"
 #include "object/object1.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/inventory/simple-appraiser.c b/src/inventory/simple-appraiser.c
index ddb4c18..27cf3a6 100644 (file)
--- a/src/inventory/simple-appraiser.c
+++ b/src/inventory/simple-appraiser.c
@@ -3,6 +3,7 @@
 #include "object/object-flavor.h"
 #include "player/avatar.h"
 #include "object/item-feeling.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"

diff --git a/src/io/character-dump.c b/src/io/character-dump.c
index 3c0fe4f..bd0a62d 100644 (file)
--- a/src/io/character-dump.c
+++ b/src/io/character-dump.c
@@ -1,5 +1,6 @@
 #include "io/character-dump.h"
 #include "system/angband-version.h"
+#include "floor/floor.h"
 #include "world/world.h"
 #include "floor/floor-town.h"
 #include "dungeon/dungeon.h"

diff --git a/src/io/load.c b/src/io/load.c
index b048c1e..c8e9d6e 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -80,6 +80,7 @@
 #include "player/player-personality.h"
 #include "player/player-sex.h"
 #include "world/world.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "io/save.h"

diff --git a/src/io/load.h b/src/io/load.h
index 833104f..67abadc 100644 (file)
--- a/src/io/load.h
+++ b/src/io/load.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "floor/floor-save.h"
+
 /*
  * Flags for wr_item()/rd_item()
  */

diff --git a/src/io/report.c b/src/io/report.c
index e507718..9d0b56e 100644 (file)
--- a/src/io/report.c
+++ b/src/io/report.c
@@ -7,6 +7,7 @@
 
 #include "system/angband.h"
 #include "io/report.h"
+#include "floor/floor.h"
 #include "core/turn-compensator.h"
 #include "system/angband-version.h"
 #include "core/stuff-handler.h"

diff --git a/src/io/save.c b/src/io/save.c
index 3aec27f..21d3f0b 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -27,7 +27,6 @@
 #include "floor/wild.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"
-#include "floor/floor-save.h"
 #include "floor/floor-town.h"
 #include "io/uid-checker.h"
 #include "io/files-util.h"

diff --git a/src/io/save.h b/src/io/save.h
index f940b69..7fe5415 100644 (file)
--- a/src/io/save.h
+++ b/src/io/save.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "floor/floor-save.h"
+
 /*
  * Flags for save/load temporary saved floor file
  */

diff --git a/src/io/special-class-dump.c b/src/io/special-class-dump.c
index 7eacd9e..6f669b8 100644 (file)
--- a/src/io/special-class-dump.c
+++ b/src/io/special-class-dump.c
@@ -8,6 +8,7 @@
 #include "special-class-dump.h"
 #include "cmd/cmd-magiceat.h"
 #include "cmd/cmd-smith.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "mspell/monster-spell.h"
 

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 8fd6483..3817790 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -20,6 +20,7 @@
 #include "cmd/cmd-building.h"
 #include "cmd-pet.h"
 #include "dungeon/dungeon-file.h"
+#include "object/object2.h"
 #include "object/object-curse.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index 013fb58..191965d 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -5,6 +5,7 @@
  */
 
 #include "io/write-diary.h"
+#include "floor/floor.h"
 #include "system/system-variables.h"
 #include "dungeon/quest.h"
 #include "io/files-util.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 9e1a2dd..2f05641 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -9,6 +9,7 @@
 #include "cmd/dump-util.h"
 #include "object/artifact.h"
 #include "core/sort.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 2174323..299b43b 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -6,6 +6,7 @@
  */
 
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "knowledge/knowledge-monsters.h"
 #include "cmd/dump-util.h"
 #include "core/sort.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 0a9b84f..a7ee25f 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -10,6 +10,7 @@
 #include "dungeon/quest.h"
 #include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも.
 #include "object/artifact.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/special-object-flags.h"
 #include "dungeon/dungeon.h"

diff --git a/src/market/arena.c b/src/market/arena.c
index 1badf26..99c9275 100644 (file)
--- a/src/market/arena.c
+++ b/src/market/arena.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "market/arena.h"
 #include "market/arena-info-table.h"
 #include "market/building-util.h"

diff --git a/src/market/bounty.c b/src/market/bounty.c
index 3d785a8..644f053 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -4,6 +4,7 @@
 #include "player/avatar.h"
 #include "market/bounty-prize-table.h"
 #include "object/item-apply-magic.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "autopick/autopick.h"
 #include "core/stuff-handler.h"

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index 81a770e..779292d 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -1,5 +1,6 @@
 #include "system/angband.h"
 #include "market/building-craft-fix.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"
 #include "object/object-kind.h"

diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index 9edd8df..2e63451 100644 (file)
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -11,6 +11,7 @@
 #include "combat/attack-accuracy.h"
 #include "market/building-util.h"
 #include "core/stuff-handler.h"
+#include "object/object2.h"
 #include "object/tr-types.h"
 #include "object/item-use-flags.h"
 #include "object/sv-weapon-types.h"

diff --git a/src/market/building-quest.c b/src/market/building-quest.c
index 48d7aec..b64e720 100644 (file)
--- a/src/market/building-quest.c
+++ b/src/market/building-quest.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "market/building-quest.h"
 #include "dungeon/quest.h"
 #include "system/system-variables.h"

diff --git a/src/monster/monster-attack.c b/src/monster/monster-attack.c
index a17ddf8..41e2b9d 100644 (file)
--- a/src/monster/monster-attack.c
+++ b/src/monster/monster-attack.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster/monster-attack.h"
+#include "floor/floor.h"
 #include "monster/monster-status.h"
 #include "dungeon/dungeon.h"
 #include "combat/monster-attack-player.h"

diff --git a/src/monster/monster-attack.h b/src/monster/monster-attack.h
index fa019dd..b4ef3ce 100644 (file)
--- a/src/monster/monster-attack.h
+++ b/src/monster/monster-attack.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "grid/grid.h"
 #include "monster/monster-util.h"
 
 void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx);

diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c
index 6a617b8..1deb1b8 100644 (file)
--- a/src/monster/monster-direction.c
+++ b/src/monster/monster-direction.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster/monster-direction.h"
+#include "floor/floor.h"
 #include "monster/monster-sweep-grid.h"
 #include "monster/monster-util.h"
 #include "monster/monster-status.h"

diff --git a/src/monster/monster-object.c b/src/monster/monster-object.c
index 6f9ac47..fad03a8 100644 (file)
--- a/src/monster/monster-object.c
+++ b/src/monster/monster-object.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster/monster-object.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"

diff --git a/src/monster/monster-safety-hiding.c b/src/monster/monster-safety-hiding.c
index 0853c4e..b81dd39 100644 (file)
--- a/src/monster/monster-safety-hiding.c
+++ b/src/monster/monster-safety-hiding.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster/monster-safety-hiding.h"
+#include "floor/floor.h"
 #include "monster/monster-dist-offsets.h"
 #include "mspell/monster-spell.h"
 

diff --git a/src/monster/monster-sweep-grid.c b/src/monster/monster-sweep-grid.c
index 20b7760..68aebc8 100644 (file)
--- a/src/monster/monster-sweep-grid.c
+++ b/src/monster/monster-sweep-grid.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster/monster-sweep-grid.h"
+#include "floor/floor.h"
 #include "monster/monster-safety-hiding.h"
 #include "mspell/monster-spell.h"
 

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index eaeacb9..cda6e55 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -49,6 +49,7 @@
 #include "object/sv-protector-types.h"
 #include "object/sv-scroll-types.h"
 #include "object/sv-weapon-types.h"
+#include "object/object2.h"
 
  /*
   * Pronoun arrays, by gender.

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 9b94839..3711854 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -20,6 +20,7 @@
 #include "cmd-pet.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "monster/monster-race-hook.h"
 #include "monster/monster-status.h"

diff --git a/src/monster/quantum-effect.c b/src/monster/quantum-effect.c
index 3d9d5b1..065e5b8 100644 (file)
--- a/src/monster/quantum-effect.c
+++ b/src/monster/quantum-effect.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "quantum-effect.h"
 #include "mspell/monster-spell.h"
 #include "spell/spells3.h"

diff --git a/src/mspell/mspell-ball.c b/src/mspell/mspell-ball.c
index 865d5ff..aa01e6c 100644 (file)
--- a/src/mspell/mspell-ball.c
+++ b/src/mspell/mspell-ball.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "mspell/mspell-ball.h"
 #include "mspell/mspell-type.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mspell/mspell-damage-calculator.c b/src/mspell/mspell-damage-calculator.c
index f9590ed..f59c3da 100644 (file)
--- a/src/mspell/mspell-damage-calculator.c
+++ b/src/mspell/mspell-damage-calculator.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "mspell/monster-spell.h"

diff --git a/src/mspell/mspell-learn-checker.c b/src/mspell/mspell-learn-checker.c
index 238622d..0502cc3 100644 (file)
--- a/src/mspell/mspell-learn-checker.c
+++ b/src/mspell/mspell-learn-checker.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "mspell-learn-checker.h"
 #include "world/world.h"
 

diff --git a/src/object/artifact.c b/src/object/artifact.c
index 0fdfa51..65f2220 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -39,6 +39,7 @@
 #include "world/world.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
+#include "object/object2.h"
 
  /*
   * The artifact arrays

diff --git a/src/object/chest.c b/src/object/chest.c
index 7035be2..e5678a2 100644 (file)
--- a/src/object/chest.c
+++ b/src/object/chest.c
@@ -2,7 +2,6 @@
 #include "object/chest.h"
 #include "util/util.h"
 #include "main/sound-definitions-table.h"
-
 #include "spell/spells-type.h"
 #include "spell/spells-summon.h"
 #include "floor/floor.h"
@@ -15,6 +14,7 @@
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "object/item-apply-magic.h"
+#include "object/object2.h"
 #include "object/sv-other-types.h"
 
 /*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */

diff --git a/src/object/object-broken.c b/src/object/object-broken.c
index b13a002..45f6e39 100644 (file)
--- a/src/object/object-broken.c
+++ b/src/object/object-broken.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "combat/snipe.h"
 #include "spell/spells-type.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 0e5bdcc..4492616 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "util/util.h"
 #include "object/artifact.h"
 #include "object/item-feeling.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 87fc403..ef5f528 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -11,7 +11,7 @@
  */
 
 #include "system/angband.h"
-#include "object/object1.h"
+#include "object/object2.h"
 #include "util/util.h"
 #include "main/sound-definitions-table.h"
 #include "world/world.h"

diff --git a/src/object/object2.h b/src/object/object2.h
index db989fd..7439364 100644 (file)
--- a/src/object/object2.h
+++ b/src/object/object2.h
@@ -3,12 +3,10 @@
 #include "floor/floor.h"
 
 extern OBJECT_SUBTYPE_VALUE coin_type;
-extern s32b flag_cost(object_type *o_ptr, int plusses);
-
 extern bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 
 int bow_tval_ammo(object_type *o_ptr);
-
+s32b flag_cost(object_type *o_ptr, int plusses);
 void excise_object_idx(floor_type *floor_ptr, OBJECT_IDX o_idx);
 void delete_object_idx(player_type *owner_ptr, OBJECT_IDX o_idx);
 void delete_object(player_type *owner_ptr, POSITION y, POSITION x);

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 4e4b02c..db8f256 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -32,6 +32,7 @@
 #include "realm/realm-song.h"
 #include "realm/realm-hex.h"
 #include "object/item-feeling.h"
+#include "object/object2.h"
 #include "object/object-ego.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 4d3733f..fa5e8ae 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -167,6 +167,7 @@
 #include "monster/monster.h"
 #include "mspell/monster-spell.h"
 #include "monster/monster-status.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"
 #include "object/object-mark-types.h"

diff --git a/src/player/player-move.h b/src/player/player-move.h
index b1000b1..e333ebb 100644 (file)
--- a/src/player/player-move.h
+++ b/src/player/player-move.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "floor/floor.h"
+
 extern void disturb(player_type *creature_ptr, bool stop_search, bool flush_output);
 extern void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool break_trap);
 extern void run_step(player_type *creature_ptr, DIRECTION dir);

diff --git a/src/player/player-status.c b/src/player/player-status.c
index e47a74a..5bc3ba8 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -23,6 +23,7 @@
 #include "spell/technic-info-table.h"
 #include "spell/spells-status.h"
 #include "object/object1.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"
 #include "object/special-object-flags.h"

diff --git a/src/player/process-death.c b/src/player/process-death.c
index a4555d6..2535ffc 100644 (file)
--- a/src/player/process-death.c
+++ b/src/player/process-death.c
@@ -11,6 +11,7 @@
 #include "floor/floor-town.h"
 #include "inventory/player-inventory.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "store/store-util.h"
 #include "store/store.h"

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 8158e17..455fec9 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -14,6 +14,7 @@
 #include "player/player-effects.h"
 #include "io/targeting.h"
 #include "realm/realm-crusade.h"
+#include "floor/floor.h"
 #include "spell/process-effect.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index adb1520..4fece80 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -31,6 +31,7 @@
 #include "player/player-skill.h"
 #include "inventory/player-inventory.h"
 #include "realm/realm-hex.h"
+#include "floor/floor.h"
 #include "grid/grid.h"
 #include "monster/monster-race.h"
 #include "io/targeting.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index e280700..08fb205 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "util/util.h"
 
-#include "cmd-spell.h"
+#include "cmd/cmd-spell.h"
 #include "spell/spells-summon.h"
 #include "spell/spells-status.h"
 #include "spell/spells-object.h"
@@ -20,6 +20,7 @@
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "spell/spells-detection.h"
+#include "object/object2.h"
 #include "object/sv-food-types.h"
 
 /*!

diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index 9cd1eb1..ab8c6f5 100644 (file)
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -8,11 +8,11 @@
 #include "monster/monster-race-hook.h"
 #include "object/item-apply-magic.h"
 #include "object/object-kind-hook.h"
+#include "object/object2.h"
 #include "grid/feature.h"
 #include "floor/floor.h"
 #include "dungeon/dungeon.h"
 
-
 /*!
 * @brief タイプ15の部屋…ガラス部屋の生成 / Type 15 -- glass rooms
 * @param player_ptr プレーヤーへの参照ポインタ

diff --git a/src/room/rooms.c b/src/room/rooms.c
index 14466ec..03e1956 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -43,7 +43,6 @@
 #include "floor/floor.h"
 #include "floor/floor-generate.h"
 #include "dungeon/dungeon.h"
-#include "grid/grid.h"
 #include "room/rooms.h"
 
 #include "room/rooms-city.h"

diff --git a/src/room/rooms.h b/src/room/rooms.h
index a950dec..cdcfa1a 100644 (file)
--- a/src/room/rooms.h
+++ b/src/room/rooms.h
@@ -11,6 +11,8 @@
 
 #pragma once
 
+#include "grid/grid.h"
+
 #define ALLOW_CAVERNS_AND_LAKES
 
 #define DUN_ROOMS_MAX  40 /*!< 部屋生成処理の最大試行数 / Number of rooms to attempt (was 50) */

diff --git a/src/spell/music-checker.c b/src/spell/music-checker.c
index 84d0b5e..a89ef26 100644 (file)
--- a/src/spell/music-checker.c
+++ b/src/spell/music-checker.c
@@ -1,4 +1,5 @@
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "spell/music-checker.h"
 #include "realm/realm-song.h"
 #include "spell/spells3.h"

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index 7a8462a..2510e13 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/spells-effect-util.h"
 #include "spell/process-effect.h"
+#include "floor/floor.h"
 #include "cmd-pet.h" // 暫定、後で消すかも.
 #include "core/stuff-handler.h"
 #include "effect/effect-feature.h"

diff --git a/src/spell/spells-detection.c b/src/spell/spells-detection.c
index 83065a2..86e585e 100644 (file)
--- a/src/spell/spells-detection.c
+++ b/src/spell/spells-detection.c
@@ -1,4 +1,6 @@
 #include "system/angband.h"
+#include "floor/floor.h"
+#include "grid/grid.h"
 #include "spell/spells-detection.h"
 #include "dungeon/dungeon.h"
 #include "realm/realm-song.h"

diff --git a/src/spell/spells-diceroll.c b/src/spell/spells-diceroll.c
index e33bf89..b3eeeb4 100644 (file)
--- a/src/spell/spells-diceroll.c
+++ b/src/spell/spells-diceroll.c
@@ -1,7 +1,6 @@
 #include "system/angband.h"
-
 #include "spell/spells-diceroll.h"
-
+#include "floor/floor.h"
 #include "monster/monster.h"
 #include "monster/monster-race-hook.h"
 #include "player/player-class.h"

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index 01395be..0cabcfa 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -6,6 +6,7 @@
 #include "grid/grid.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 1f228e4..39b54c9 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -10,6 +10,7 @@
 #include "object/item-apply-magic.h"
 #include "object/item-feeling.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-boost.h"
 #include "object/object-hook.h"
 #include "object/object-flavor.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 22e4a95..c845d57 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -11,8 +11,9 @@
 #include "spell/spells-status.h"
 #include "spell/spells-type.h"
 #include "monster/monster.h"
-#include "cmd-spell.h"
+#include "cmd/cmd-spell.h"
 #include "player/player-effects.h"
+#include "object/object2.h"
 #include "object/object-kind.h"
 #include "io/targeting.h"
 #include "realm/realm-song.h"

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index 66487eb..788d5d2 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -8,6 +8,7 @@
 #include "effect/spells-effect-util.h"
 #include "spell/spells2.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/sv-other-types.h"
 

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index 17c2a39..e2eefad 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -12,6 +12,7 @@
  */
 
 #include "system/angband.h"
+#include "floor/floor.h"
 #include "system/system-variables.h"
 #include "util/util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 29b3177..c76aec1 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -39,6 +39,7 @@
 #include "realm/realm-hex.h"
 #include "autopick/autopick.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 57f006b..c92e305 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -27,6 +27,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor-town.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-boost.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
@@ -66,7 +67,6 @@
 #include "autopick/autopick.h"
 #include "io/targeting.h"
 #include "effect/spells-effect-util.h"
-#include "spell/spells-util.h"
 #include "spell/spells-execution.h"
 #include "spell/process-effect.h"
 #include "mind/racial-force-trainer.h"

diff --git a/src/spell/spells3.h b/src/spell/spells3.h
index 0831048..434c273 100644 (file)
--- a/src/spell/spells3.h
+++ b/src/spell/spells3.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "spell/spells-util.h"
+
 bool teleport_away(player_type* caster_ptr, MONSTER_IDX m_idx, POSITION dis, teleport_flags mode);
 void teleport_monster_to(player_type* caster_ptr, MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, teleport_flags mode);
 bool teleport_player_aux(player_type* creature_ptr, POSITION dis, bool is_quantum_effect, teleport_flags mode);

diff --git a/src/store/rumor.c b/src/store/rumor.c
index 61afa2c..327e852 100644 (file)
--- a/src/store/rumor.c
+++ b/src/store/rumor.c
@@ -4,6 +4,7 @@
 
 #include "io/tokenizer.h"
 #include "io/files-util.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/artifact.h"
 #include "object/special-object-flags.h"

diff --git a/src/store/store-util.c b/src/store/store-util.c
index 0a3234d..fb65f60 100644 (file)
--- a/src/store/store-util.c
+++ b/src/store/store-util.c
@@ -2,6 +2,7 @@
 #include "store/store-util.h"
 #include "object/item-apply-magic.h"
 #include "object/item-feeling.h"
+#include "object/object2.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/tr-types.h"

diff --git a/src/store/store.c b/src/store/store.c
index 55483ec..6aaa5c4 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -48,6 +48,7 @@
 #include "inventory/player-inventory.h"
 #include "object/item-feeling.h"
 #include "object/item-use-flags.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "floor/floor-events.h"

diff --git a/src/system/angband.h b/src/system/angband.h
index 0b28754..8881a0e 100644 (file)
--- a/src/system/angband.h
+++ b/src/system/angband.h
@@ -41,8 +41,8 @@
 
 #include "monster/monster.h"
 #include "monster/monster-race.h"
+#include "object/object-util.h"
 #include "object/object1.h"
-#include "object/object2.h"
 #include "player/player-status.h"
 
 

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 79797f6..7154341 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -24,6 +24,7 @@
 #include "world/world.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"
+#include "object/object2.h"
 #include "object/object-mark-types.h"
 #include "player/avatar.h"
 #include "view/display-player.h"

diff --git a/src/view/display-main-window.h b/src/view/display-main-window.h
index 3db21f9..a584c3e 100644 (file)
--- a/src/view/display-main-window.h
+++ b/src/view/display-main-window.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "grid/feature.h"
+
 extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p);
 extern int panel_col_of(int col);
 extern void apply_default_feat_lighting(TERM_COLOR f_attr[F_LIT_MAX], SYMBOL_CODE f_char[F_LIT_MAX]);

diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c
index 91bf3d4..71ee76f 100644 (file)
--- a/src/view/display-player-middle.c
+++ b/src/view/display-player-middle.c
@@ -1,4 +1,5 @@
-#include "view/display-player-middle.h"
+#include "floor/floor.h"
+#include "view/display-player-middle.h"
 #include "view/status-first-page.h"
 #include "view/display-util.h"
 #include "player/player-effects.h"

diff --git a/src/view/display-player.c b/src/view/display-player.c
index 0f98b4e..08d3224 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -7,6 +7,7 @@
  */
 
 #include "display-player.h"
+#include "floor/floor.h"
 #include "player/mimic-info-table.h"
 #include "player/player-personality.h"
 #include "term/gameterm.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 348dba4..b10eecf 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -44,6 +44,7 @@
 #include "spell/spells-floor.h"
 
 #include "object/item-apply-magic.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "monster/monster-status.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 6d06ed4..dfbbfdc 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -14,13 +14,13 @@
 #include "wizard/wizard-spoiler.h"
 #include "util/util.h"
 #include "term/gameterm.h"
-
 #include "system/angband-version.h"
 #include "object/artifact.h"
 #include "core/sort.h"
 #include "store/store.h"
 #include "store/store-util.h"
 #include "monster/monster.h"
+#include "object/object2.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"