From cc671773a2c58c9ddd93b5dbe5c29706b7d7d72d Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 29 May 2020 21:41:23 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#40399=20angband.h=20=E3=81=8B?= =?utf8?q?=E3=82=89object2.h=E3=81=AE=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AB?= =?utf8?q?=E3=83=BC=E3=83=89=20=E3=82=92*=E6=8A=B9=E6=AE=BA*=E3=81=97?= =?utf8?q?=E3=81=9F=20/=20*Genocide*=20inclusion=20object2.h=20from=20angb?= =?utf8?q?and.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick/autopick-destroyer.c | 1 + src/autopick/autopick-matcher.c | 1 + src/autopick/autopick.c | 1 + src/autopick/autopick.h | 1 + src/birth/game-play-initializer.c | 1 + src/birth/inventory-initializer.c | 1 + src/cmd/cmd-activate.c | 2 +- src/cmd/cmd-attack.c | 1 + src/cmd/cmd-basic.c | 1 + src/cmd/cmd-dump.c | 1 + src/cmd/cmd-eat.c | 2 +- src/cmd/cmd-item.c | 20 ++++++++++---------- src/cmd/cmd-knowledge.c | 1 + src/cmd/cmd-magiceat.c | 11 ++++++----- src/cmd/cmd-pet.c | 1 - src/cmd/cmd-pet.h | 2 ++ src/cmd/cmd-quaff.c | 1 + src/cmd/cmd-read.c | 1 + src/cmd/cmd-smith.c | 2 +- src/cmd/cmd-usestaff.c | 1 + src/cmd/cmd-visuals.c | 1 + src/cmd/cmd-zaprod.c | 1 + src/cmd/cmd-zapwand.c | 1 + src/cmd/dump-util.c | 1 - src/cmd/dump-util.h | 2 ++ src/cmd/lighting-level-table.c | 1 - src/cmd/lighting-level-table.h | 2 ++ src/combat/attack-accuracy.c | 3 +-- src/combat/attack-accuracy.h | 1 + src/combat/attack-chaos-effect.c | 1 + src/combat/monster-attack-monster.c | 1 + src/combat/monster-attack-player.c | 1 + src/combat/player-attack-util.h | 1 + src/combat/player-attack.c | 1 + src/combat/shoot.c | 1 + src/combat/slaying.c | 1 + src/combat/snipe.c | 1 + src/core/hp-mp-processor.c | 2 ++ src/core/hp-mp-regenerator.c | 1 + src/core/turn-compensator.c | 1 + src/dungeon/dungeon-file.c | 1 + src/dungeon/dungeon.c | 3 +-- src/dungeon/dungeon.h | 3 +++ src/dungeon/quest.c | 1 + src/effect/effect-feature.c | 2 ++ src/effect/effect-item.c | 1 + src/effect/effect-monster-domination.c | 1 + src/effect/effect-monster-oldies.c | 1 + src/effect/effect-monster-psi.c | 1 + src/effect/effect-monster-util.c | 1 + src/effect/effect-monster-util.h | 2 ++ src/effect/effect-monster.c | 1 + src/floor/floor-events.c | 1 + src/floor/floor-save.c | 1 + src/floor/floor-streams.c | 2 +- src/floor/floor.c | 1 + src/floor/wild.c | 1 - src/floor/wild.h | 2 ++ src/inventory/inventory-damage.c | 1 + src/inventory/pack-overflow.c | 1 + src/inventory/player-inventory.c | 1 + src/inventory/simple-appraiser.c | 1 + src/io/character-dump.c | 1 + src/io/load.c | 1 + src/io/load.h | 2 ++ src/io/report.c | 1 + src/io/save.c | 1 - src/io/save.h | 2 ++ src/io/special-class-dump.c | 1 + src/io/targeting.c | 1 + src/io/write-diary.c | 1 + src/knowledge/knowledge-items.c | 1 + src/knowledge/knowledge-monsters.c | 1 + src/knowledge/knowledge-quests.c | 1 + src/market/arena.c | 1 + src/market/bounty.c | 1 + src/market/building-craft-fix.c | 1 + src/market/building-craft-weapon.c | 1 + src/market/building-quest.c | 1 + src/monster/monster-attack.c | 1 + src/monster/monster-attack.h | 1 + src/monster/monster-direction.c | 1 + src/monster/monster-object.c | 1 + src/monster/monster-safety-hiding.c | 1 + src/monster/monster-sweep-grid.c | 1 + src/monster/monster1.c | 1 + src/monster/monster2.c | 1 + src/monster/quantum-effect.c | 1 + src/mspell/mspell-ball.c | 1 + src/mspell/mspell-damage-calculator.c | 1 + src/mspell/mspell-learn-checker.c | 1 + src/object/artifact.c | 1 + src/object/chest.c | 2 +- src/object/object-broken.c | 1 + src/object/object-hook.c | 1 + src/object/object2.c | 2 +- src/object/object2.h | 4 +--- src/player/player-effects.c | 1 + src/player/player-move.c | 1 + src/player/player-move.h | 2 ++ src/player/player-status.c | 1 + src/player/process-death.c | 1 + src/realm/realm-crusade.c | 1 + src/realm/realm-hex.c | 1 + src/realm/realm-nature.c | 3 ++- src/room/rooms-special.c | 2 +- src/room/rooms.c | 1 - src/room/rooms.h | 2 ++ src/spell/music-checker.c | 1 + src/spell/process-effect.c | 1 + src/spell/spells-detection.c | 2 ++ src/spell/spells-diceroll.c | 3 +-- src/spell/spells-floor.c | 1 + src/spell/spells-object.c | 1 + src/spell/spells-status.c | 3 ++- src/spell/spells-summon.c | 1 + src/spell/spells1.c | 1 + src/spell/spells2.c | 1 + src/spell/spells3.c | 2 +- src/spell/spells3.h | 2 ++ src/store/rumor.c | 1 + src/store/store-util.c | 1 + src/store/store.c | 1 + src/system/angband.h | 2 +- src/view/display-main-window.c | 1 + src/view/display-main-window.h | 2 ++ src/view/display-player-middle.c | 3 ++- src/view/display-player.c | 1 + src/wizard/wizard-special-process.c | 1 + src/wizard/wizard-spoiler.c | 2 +- 130 files changed, 157 insertions(+), 43 deletions(-) diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c index 9e22ac5b5..ce31f218a 100644 --- 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 b82160c52..151fa03d7 100644 --- 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 373141e77..d33867395 100644 --- 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 cc580cf8c..aaf895266 100644 --- 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 fa038d3ed..01a12a1ce 100644 --- 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 aaa0ba994..7a1c25d48 100644 --- 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 2e5a66fef..f8998f533 100644 --- 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 a5a545935..cab96756c 100644 --- 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 9ea313883..d82a82a10 100644 --- 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 fe604e008..e7e9f898c 100644 --- 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 61a48feb3..5f5657610 100644 --- 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 1541b062f..7672d95e0 100644 --- 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 f9a5e2ac7..0b215a0fa 100644 --- 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 6114374c6..f602ff88e 100644 --- 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 5df404b7e..8a34a0b42 100644 --- 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 0141d1764..b870bd79e 100644 --- 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 32e9e0f0d..2302d2cef 100644 --- 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 a884ac124..0f32b6c7d 100644 --- 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 3d3c75eae..96dca5644 100644 --- 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 66edb2559..cd49f0b4b 100644 --- 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 492e3573a..56074c5a2 100644 --- 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 ab93e6b0d..d5c99e904 100644 --- 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 6fa58d2f4..f9f855ab7 100644 --- 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 2e945524f..40865b456 100644 --- 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 329a4aa74..ea2e968c7 100644 --- 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 6949b0811..0624f0735 100644 --- 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 26328cca8..705b8a249 100644 --- 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 6f0ba625d..adcdea0d2 100644 --- 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 e673d9acb..810f721c1 100644 --- 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 b45d228f6..3de0acde3 100644 --- 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 404a44a07..53d390d25 100644 --- 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 2416a5bf5..81e1e9c91 100644 --- 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 696324355..d0b5abf21 100644 --- 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 224b57537..fbd5bbef1 100644 --- 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 4d98e0e49..a418037e4 100644 --- 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 f539f8fad..4f30a08e1 100644 --- 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 f35c1ec8b..a214c46cb 100644 --- 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 936583609..38b3c81de 100644 --- 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 29acf3486..2b54995f1 100644 --- 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 fd4e9257d..fdcbcb54c 100644 --- 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 2172a8f72..5be74c4f3 100644 --- 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 4d19e8494..233656cd4 100644 --- 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 dfd44665b..bf0a136cc 100644 --- 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 8ab79392d..f9c786b1a 100644 --- 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 419242372..0301abf18 100644 --- 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 1318d3e31..b55d2b7ac 100644 --- 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 823ef0bcd..ef8b4dca0 100644 --- 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 44bace974..01781dab2 100644 --- 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 657fc4f91..5ed19cf08 100644 --- 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 bcddf46a6..aa67ab954 100644 --- 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 ec1b6b0ce..aef6fc729 100644 --- 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 61ae84fe8..a29b36af0 100644 --- 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 2ab26f372..00e4464ef 100644 --- 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 e420eada9..e98300352 100644 --- 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 6ae8febea..956046323 100644 --- 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 989a27b14..d07263902 100644 --- 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 3dbeba692..d3b7b2fc4 100644 --- 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 225e55c86..2ec417d9f 100644 --- 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 2bd9f690c..ed8a837a0 100644 --- 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 cea9ad811..1403362a8 100644 --- 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 6d13f3f28..5911bac1f 100644 --- 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 ddb4c18db..27cf3a6f8 100644 --- 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 3c0fe4fc7..bd0a62da6 100644 --- 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 b048c1e7e..c8e9d6ec2 100644 --- 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 833104f08..67abadc3d 100644 --- 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 e50771841..9d0b56e7c 100644 --- 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 3aec27fda..21d3f0bb6 100644 --- 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 f940b6952..7fe54152a 100644 --- 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 7eacd9ebd..6f669b86c 100644 --- 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 8fd64830a..3817790b1 100644 --- 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 013fb5800..191965dd5 100644 --- 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 9e1a2dd0d..2f056416e 100644 --- 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 217432370..299b43b83 100644 --- 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 0a9b84f39..a7ee25f75 100644 --- 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 1badf26a7..99c92751b 100644 --- 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 3d785a877..644f053cd 100644 --- 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 81a770e18..779292d40 100644 --- 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 9edd8dfc5..2e634514e 100644 --- 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 48d7aec2f..b64e720b1 100644 --- 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 a17ddf840..41e2b9d0e 100644 --- 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 fa019ddff..b4ef3ce83 100644 --- 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 6a617b8d2..1deb1b8b6 100644 --- 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 6f9ac4721..fad03a875 100644 --- 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 0853c4e11..b81dd39fe 100644 --- 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 20b776032..68aebc850 100644 --- 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 eaeacb922..cda6e55c9 100644 --- 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 9b9483933..371185423 100644 --- 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 3d9d5b15e..065e5b81f 100644 --- 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 865d5ffe9..aa01e6c9a 100644 --- 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 f9590edce..f59c3daec 100644 --- 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 238622d68..0502cc33a 100644 --- 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 0fdfa5168..65f2220d0 100644 --- 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 7035be295..e5678a289 100644 --- 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 b13a00295..45f6e393b 100644 --- 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 0e5bdcc9e..4492616ad 100644 --- 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 87fc40305..ef5f5287d 100644 --- 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 db989fd06..7439364c8 100644 --- 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 4e4b02c84..db8f2564d 100644 --- 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 4d3733f94..fa5e8aeae 100644 --- 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 b1000b1c2..e333ebbd9 100644 --- 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 e47a74a86..5bc3ba89d 100644 --- 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 a4555d658..2535ffcc9 100644 --- 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 8158e17c5..455fec978 100644 --- 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 adb1520ad..4fece80fd 100644 --- 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 e280700fa..08fb2050b 100644 --- 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 9cd1eb1ae..ab8c6f5cb 100644 --- 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 14466ecb5..03e1956b1 100644 --- 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 a950dece3..cdcfa1a52 100644 --- 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 84d0b5e5a..a89ef264b 100644 --- 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 7a8462a08..2510e1375 100644 --- 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 83065a230..86e585e56 100644 --- 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 e33bf895b..b3eeeb4b2 100644 --- 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 01395be19..0cabcfad9 100644 --- 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 1f228e438..39b54c992 100644 --- 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 22e4a9503..c845d57f6 100644 --- 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 66487eb34..788d5d2cf 100644 --- 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 17c2a3999..e2eefad2d 100644 --- 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 29b317723..c76aec1a0 100644 --- 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 57f006b57..c92e305c2 100644 --- 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 083104867..434c27374 100644 --- 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 61afa2c8d..327e852d1 100644 --- 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 0a3234d8a..fb65f6029 100644 --- 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 55483ecd3..6aaa5c429 100644 --- 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 0b2875492..8881a0e16 100644 --- 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 79797f68f..715434119 100644 --- 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 3db21f9e9..a584c3e33 100644 --- 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 91bf3d4c3..71ee76fef 100644 --- 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 0f98b4e50..08d32241a 100644 --- 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 348dba462..b10eecff0 100644 --- 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 6d06ed482..dfbbfdcfb 100644 --- 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" -- 2.11.0