[Refactor] #40483 Removed the inclusion of grid.h from rooms.h

diff --git a/src/grid/grid.h b/src/grid/grid.h
index 892be69..7f19410 100644 (file)
--- a/src/grid/grid.h
+++ b/src/grid/grid.h
@@ -154,8 +154,6 @@ typedef struct grid_template_type {
 #define DOOR_GLASS_DOOR  1
 #define DOOR_CURTAIN     2
 
-#define MAX_DOOR_TYPES   3
-
 extern bool new_player_spot(player_type *creature_ptr);
 extern pos_list tmp_pos;
 

diff --git a/src/info-reader/feature-reader.c b/src/info-reader/feature-reader.c
index 4fd8dee..bea5922 100644 (file)
--- a/src/info-reader/feature-reader.c
+++ b/src/info-reader/feature-reader.c
@@ -1,6 +1,7 @@
 #include "info-reader/feature-reader.h"
 #include "floor/wild.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "grid/trap.h"
 #include "info-reader/feature-info-tokens-table.h"
 #include "info-reader/parse-error-types.h"

diff --git a/src/main/init.c b/src/main/init.c
index f15f015..bf4ee6c 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -41,6 +41,7 @@
 #include "game-option/option-flags.h"
 #include "game-option/option-types-table.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "grid/trap.h"
 #include "info-reader/artifact-reader.h"
 #include "info-reader/dungeon-reader.h"

diff --git a/src/room/rooms.c b/src/room/rooms.c
index 87df476..3780228 100644 (file)
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -43,6 +43,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "grid/trap.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/place-monster-types.h"

diff --git a/src/room/rooms.h b/src/room/rooms.h
index 9c4dd8c..c7e5db7 100644 (file)
--- a/src/room/rooms.h
+++ b/src/room/rooms.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "grid/grid.h"
 
 #define ALLOW_CAVERNS_AND_LAKES
 
@@ -54,16 +53,13 @@
 /*
  * Room type information
  */
-typedef struct room_info_type room_info_type;
-
-struct room_info_type
-{
+typedef struct room_info_type {
         /* Allocation information. */
         s16b prob[ROOM_T_MAX];
 
         /* Minimum level on which room can appear. */
         byte min_level;
-};
+} room_info_type;
 
 extern void build_lake(player_type *player_ptr, int type);
 extern void build_cavern(player_type *player_ptr);
@@ -74,8 +70,7 @@ extern void build_cavern(player_type *player_ptr);
 /*
  * A structure type for doors
  */
-typedef struct
-{
+typedef struct door_type {
        FEAT_IDX open;
        FEAT_IDX broken;
        FEAT_IDX closed;
@@ -85,6 +80,8 @@ typedef struct
        FEAT_IDX num_jammed;
 } door_type;
 
+#define MAX_DOOR_TYPES 3
+
 door_type feat_door[MAX_DOOR_TYPES];
 
 extern bool generate_rooms(player_type *player_ptr);