[Refactor] #40483 Removed the inclusion of feature.h from floor.h

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index 57af069..b1e6d31 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -25,6 +25,7 @@
 #include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "grid/feature.h"
 #include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "io/input-key-requester.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index fe44557..732a29d 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -19,6 +19,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/input-options.h"
 #include "game-option/special-options.h"
+#include "grid/feature.h"
 #include "inventory/player-inventory.h"
 #include "io/files-util.h"
 #include "io/targeting.h"

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index 8808882..b38c2ba 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -9,6 +9,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
 #include "game-option/cheat-types.h"
+#include "grid/feature.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "object-enchant/apply-magic.h"

diff --git a/src/floor/floor.h b/src/floor/floor.h
index 25eb30f..42f03d5 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "grid/feature.h"
 #include "grid/grid.h"
 #include "system/monster-type-definition.h"
 #include "system/object-type-definition.h"

diff --git a/src/floor/geometry.c b/src/floor/geometry.c
index 3aff659..afe3cd4 100644 (file)
--- a/src/floor/geometry.c
+++ b/src/floor/geometry.c
@@ -1,6 +1,7 @@
 #include "floor/floor.h"
 #include "floor/geometry.h"
 #include "game-option/text-display-options.h"
+#include "grid/feature.h"
 #include "util/bit-flags-calculator.h"
 
 /*!

diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c
index 69caef2..0dd4650 100644 (file)
--- a/src/mind/mind-ninja.c
+++ b/src/mind/mind-ninja.c
@@ -4,6 +4,7 @@
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"
+#include "grid/feature.h"
 #include "io/targeting.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/monster-floor/monster-move.c b/src/monster-floor/monster-move.c
index ca4cfae..eca9222 100644 (file)
--- a/src/monster-floor/monster-move.c
+++ b/src/monster-floor/monster-move.c
@@ -5,23 +5,24 @@
  */
 
 #include "monster-floor/monster-move.h"
+#include "core/speed-table.h"
 #include "effect/effect-characteristics.h"
 #include "game-option/disturbance-options.h"
+#include "grid/feature.h"
 #include "io/files-util.h"
-#include "monster-race/race-indice-types.h"
-#include "core/speed-table.h"
+#include "monster-attack/monster-attack-processor.h"
+#include "monster-floor/monster-object.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"
-#include "monster-attack/monster-attack-processor.h"
+#include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-flag-types.h"
-#include "monster-floor/monster-object.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
-#include "monster/monster-info.h"
 #include "pet/pet-util.h"
 #include "player/player-move.h"
 #include "spell/process-effect.h"

diff --git a/src/monster-floor/monster-sweep-grid.c b/src/monster-floor/monster-sweep-grid.c
index 5a9ecca..49ff499 100644 (file)
--- a/src/monster-floor/monster-sweep-grid.c
+++ b/src/monster-floor/monster-sweep-grid.c
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-sweep-grid.h"
 #include "floor/floor.h"
+#include "grid/feature.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"

diff --git a/src/monster/monster-info.c b/src/monster/monster-info.c
index 2bad56f..dbb1284 100644 (file)
--- a/src/monster/monster-info.c
+++ b/src/monster/monster-info.c
@@ -12,6 +12,7 @@
 #include "monster/monster-info.h"
 #include "dungeon/quest.h"
 #include "floor/wild.h"
+#include "grid/feature.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/pet/pet-fall-off.c b/src/pet/pet-fall-off.c
index 1bd577c..e4dbc64 100644 (file)
--- a/src/pet/pet-fall-off.c
+++ b/src/pet/pet-fall-off.c
@@ -7,6 +7,7 @@
 #include "pet/pet-fall-off.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
+#include "grid/feature.h"
 #include "io/targeting.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-describer.h"

diff --git a/src/room/rooms-city.c b/src/room/rooms-city.c
index c88b611..b8c0d66 100644 (file)
--- a/src/room/rooms-city.c
+++ b/src/room/rooms-city.c
@@ -3,6 +3,7 @@
 #include "floor/floor.h"
 #include "floor/wild.h"
 #include "game-option/cheat-types.h"
+#include "grid/feature.h"
 #include "grid/grid.h"
 #include "room/rooms.h"
 #include "store/store-util.h"

diff --git a/src/spell-realm/spells-crusade.c b/src/spell-realm/spells-crusade.c
index da45610..a1a9026 100644 (file)
--- a/src/spell-realm/spells-crusade.c
+++ b/src/spell-realm/spells-crusade.c
@@ -7,6 +7,7 @@
 #include "spell-realm/spells-crusade.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
+#include "grid/feature.h"
 #include "io/targeting.h"
 #include "spell/range-calc.h"
 #include "spell/process-effect.h"

diff --git a/src/spell/range-calc.c b/src/spell/range-calc.c
index 59392c2..14ed552 100644 (file)
--- a/src/spell/range-calc.c
+++ b/src/spell/range-calc.c
@@ -5,6 +5,7 @@
  */
 
 #include "spell/range-calc.h"
+#include "grid/feature.h"
 #include "spell/spell-types.h"
 #include "util/bit-flags-calculator.h"
 

diff --git a/src/util/sort.c b/src/util/sort.c
index 5649421..fa58b71 100644 (file)
--- a/src/util/sort.c
+++ b/src/util/sort.c
@@ -1,10 +1,11 @@
 #include "util/sort.h"
-#include "floor/floor.h"
 #include "dungeon/quest.h"
-#include "object-enchant/artifact.h"
+#include "floor/floor.h"
+#include "grid/feature.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
+#include "object-enchant/artifact.h"
 
 /*
  * Angband sorting algorithm -- quick sort in place