[Refactor] #39912 不要インクルードファイル整理中． / Refactoring unused include files.

diff --git a/src/angband.h b/src/angband.h
index 21765dd..f394aa6 100644 (file)
--- a/src/angband.h
+++ b/src/angband.h
@@ -21,7 +21,6 @@
  * First, include the low-level includes.  Be sure to edit "h-config.h"
  * to reflect any hardware, operating system, or compiler nuances.
  */
-#include "h-basic.h"
 
 
 /*
@@ -40,9 +39,6 @@
 #include "gamevalue.h"
 #include "cmd-gameoption.h"
 
-#include "geometry.h"
-#include "grid.h"
-#include "floor-save.h"
 #include "monster.h"
 #include "monsterrace.h"
 #include "object.h"

diff --git a/src/cmd/cmd-gameoption.h b/src/cmd/cmd-gameoption.h
index 73893fb..3ff4d87 100644 (file)
--- a/src/cmd/cmd-gameoption.h
+++ b/src/cmd/cmd-gameoption.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "h-type.h"
 
 /*** Option Definitions ***/
 

diff --git a/src/cmd/cmd-pet.h b/src/cmd/cmd-pet.h
index e0ba531..6065f61 100644 (file)
--- a/src/cmd/cmd-pet.h
+++ b/src/cmd/cmd-pet.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "grid.h"
 
 extern bool do_cmd_riding(player_type *creature_ptr, bool force);
 extern PERCENTAGE calculate_upkeep(player_type *creature_ptr);

diff --git a/src/floor-save.h b/src/floor-save.h
index 911b0d9..22038ee 100644 (file)
--- a/src/floor-save.h
+++ b/src/floor-save.h
@@ -2,6 +2,9 @@
 
 #define MAX_SAVED_FLOORS       20 /*!< 保存フロアの最大数 / Maximum number of saved floors. */
 
+struct player_type;
+typedef struct player_type player_type;
+
 /*
  *  A structure type for the saved floor
  */

diff --git a/src/floor.h b/src/floor.h
index 30aca92..f5b7554 100644 (file)
--- a/src/floor.h
+++ b/src/floor.h
@@ -3,6 +3,8 @@
 #include "feature.h"
 #include "grid.h"
 #include "object.h"
+#include "floor-save.h"
+
 
 /*!
  * @brief ダンジョンの最深層 / Maximum dungeon level.

diff --git a/src/rooms.h b/src/rooms.h
index 4e96ec5..a950dec 100644 (file)
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -10,7 +10,6 @@
  */
 
 #pragma once
-#include "floor.h"
 
 #define ALLOW_CAVERNS_AND_LAKES
 

diff --git a/src/view-mainwindow.h b/src/view-mainwindow.h
index 5b856a8..3db21f9 100644 (file)
--- a/src/view-mainwindow.h
+++ b/src/view-mainwindow.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "feature.h"
 
 extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p);
 extern int panel_col_of(int col);

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