[Refactor] #40569 Removed the reference for floor.h from world-object.h

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index f3efcca..cd3e348 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -9,6 +9,7 @@
 #include "flavor/object-flavor-types.h"
 #include "floor/cave.h"
 #include "floor/floor-object.h"
+#include "floor/floor.h"
 #include "game-option/cheat-types.h"
 #include "game-option/special-options.h"
 #include "grid/feature.h"

diff --git a/src/floor/fixed-map-generator.c b/src/floor/fixed-map-generator.c
index eccd031..6915240 100644 (file)
--- a/src/floor/fixed-map-generator.c
+++ b/src/floor/fixed-map-generator.c
@@ -3,6 +3,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor-object.h"
 #include "floor/floor-town.h"
+#include "floor/floor.h"
 #include "floor/wild.h"
 #include "grid/feature.h"
 #include "grid/grid.h"

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index 747fa4b..a02cb87 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -10,6 +10,7 @@
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/cave.h"
+#include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
 #include "game-option/cheat-types.h"

diff --git a/src/world/world-object.c b/src/world/world-object.c
index fc860d5..c2bf35c 100644 (file)
--- a/src/world/world-object.c
+++ b/src/world/world-object.c
@@ -1,6 +1,7 @@
 #include "world/world-object.h"
 #include "dungeon/dungeon-flag-types.h"
 #include "dungeon/dungeon.h"
+#include "floor/floor.h"
 #include "object-enchant/item-apply-magic.h"
 #include "object/object-kind.h"
 #include "system/alloc-entries.h"

diff --git a/src/world/world-object.h b/src/world/world-object.h
index 81c3d51..fc2fe8f 100644 (file)
--- a/src/world/world-object.h
+++ b/src/world/world-object.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "floor/floor.h"
 
 OBJECT_IDX o_pop(floor_type *floor_ptr);
 OBJECT_IDX get_obj_num(player_type *o_ptr, DEPTH level, BIT_FLAGS mode);