[Refactor] #37353 floor.c を作成して floor_type 型整理。

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index cc01e03..13793ef 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -155,6 +155,7 @@
     <ClCompile Include="..\..\src\floor-events.c" />\r
     <ClCompile Include="..\..\src\floor-generate.c" />\r
     <ClCompile Include="..\..\src\floor-save.c" />\r
+    <ClCompile Include="..\..\src\floor.c" />\r
     <ClCompile Include="..\..\src\geometry.c" />\r
     <ClCompile Include="..\..\src\history.c" />\r
     <ClCompile Include="..\..\src\init.c" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index c02aa38..d630c91 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -315,6 +315,9 @@
     <ClCompile Include="..\..\src\player-skill.c">
       <Filter>player</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\floor.c">
+      <Filter>floor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 1074507..1d415b5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ hengband_SOURCES = \
        \
        defines.h dungeon.c externs.h files.c files.h \
        \
-       floor.h floor-events.c floor-events.h floor-generate.c floor-generate.h \
+       floor.c floor.h floor-events.c floor-events.h floor-generate.c floor-generate.h \
        floor-save.h floor-save.c \
        floor-streams.c floor-streams.h \
        \

diff --git a/src/artifact.c b/src/artifact.c
index 7c8515d..74c03f6 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -16,6 +16,7 @@
 #include "artifact.h"
 
 #include "avatar.h"
+#include "floor.h"
 #include "cmd-activate.h"
 #include "object-boost.h"
 #include "object-curse.h"

diff --git a/src/autopick.c b/src/autopick.c
index c77d951..ca3a3a2 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -23,6 +23,7 @@
 #include "object-hook.h"
 
 #include "files.h"
+#include "floor.h"
 
 #define MAX_LINELEN 1024
 

diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index 576aa64..6046d9c 100644 (file)
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -17,6 +17,7 @@
 #include "realm-hex.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "floor.h"
 
 /*!
  * @brief 食料を食べるコマンドのサブルーチン

diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index f6978ab..fbe0979 100644 (file)
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -22,6 +22,7 @@
 #include "spells-floor.h"
 #include "object-broken.h"
 #include "cmd-basic.h"
+#include "floor.h"
 
 /*!
  * @brief 薬を飲むコマンドのサブルーチン /

diff --git a/src/cmd-read.c b/src/cmd-read.c
index fc4a641..0e32a68 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -26,6 +26,7 @@
 
 #include "cmd-basic.h"
 #include "files.h"
+#include "floor.h"
 
 /*!
  * @brief 巻物を読むコマンドのサブルーチン

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 87de891..f456f97 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -33,6 +33,7 @@
 #include "object-hook.h"
 #include "cmd-basic.h"
 #include "view-mainwindow.h"
+#include "floor.h"
 
 /*!
  * @brief

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 21277ed..ee20ab0 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -10,6 +10,7 @@
 #include "spells-floor.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
+#include "floor.h"
 
 
 

diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index 6fdfc94..f0f4420 100644 (file)
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -9,6 +9,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "cmd-basic.h"
+#include "floor.h"
 
 /*!
  * @brief ロッドの効果を発動する

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index 3fd90c8..8e2ec27 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -8,6 +8,7 @@
 #include "player-effects.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
+#include "floor.h"
 
 
 /*!

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 0525e49..7275fab 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -9,6 +9,7 @@
 #include "monster.h"
 #include "files.h"
 #include "player-skill.h"
+#include "floor.h"
 
 dungeon_grid letter[255];
 

diff --git a/src/externs.h b/src/externs.h
index 4122203..08c1e03 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -223,7 +223,6 @@ extern const char angband_term_name[8][16];
 extern byte angband_color_table[256][4];
 extern const concptr angband_sound_name[SOUND_MAX];
 extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];
-extern floor_type *current_floor_ptr;
 extern world_type *current_world_ptr;
 extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 extern FLOOR_IDX max_floor_id;

diff --git a/src/files.c b/src/files.c
index 2f4fc5c..dd903aa 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -47,6 +47,7 @@
 #include "init.h"
 #include "monster-spell.h"
 #include "player-skill.h"
+#include "floor.h"
 
 
 /*

diff --git a/src/floor.c b/src/floor.c
new file mode 100644 (file)
index 0000000..cd3b7d0
--- /dev/null
+++ b/src/floor.c
@@ -0,0 +1,10 @@
+#include "angband.h"
+#include "floor.h"
+
+/*
+ * The array of "current_floor_ptr->grid_array grids" [MAX_WID][MAX_HGT].
+ * Not completely allocated, that would be inefficient
+ * Not completely hardcoded, that would overflow memory
+ */
+floor_type floor_info;
+floor_type *current_floor_ptr = &floor_info;

diff --git a/src/floor.h b/src/floor.h
index 864a5cb..112560f 100644 (file)
--- a/src/floor.h
+++ b/src/floor.h
@@ -1,4 +1,44 @@
-
+#pragma once
+
+typedef struct {
+       grid_type *grid_array[MAX_HGT];
+       DEPTH dun_level;                /*!< 現在の実ダンジョン階層base_levelの参照元となる / Current dungeon level */
+       DEPTH base_level;               /*!< 基本生成レベル、後述のobject_level, monster_levelの参照元となる / Base dungeon level */
+       DEPTH object_level;             /*!< アイテムの生成レベル、current_floor_ptr->base_levelを起点に一時変更する時に参照 / Current object creation level */
+       DEPTH monster_level;    /*!< モンスターの生成レベル、current_floor_ptr->base_levelを起点に一時変更する時に参照 / Current monster creation level */
+       POSITION width;                 /* Current dungeon width */
+       POSITION height;                /* Current dungeon height */
+       MONSTER_NUMBER num_repro; /*!< Current reproducer count */
+
+       GAME_TURN generated_turn; /* Turn when level began */
+
+       object_type *o_list; /*!< The array of dungeon items [current_floor_ptr->max_o_idx] */
+       OBJECT_IDX max_o_idx; /*!< Maximum number of objects in the level */
+
+       monster_type *m_list; /*!< The array of dungeon monsters [current_floor_ptr->max_m_idx] */
+       MONSTER_IDX max_m_idx; /*!< Maximum number of monsters in the level */
+
+       s16b *mproc_list[MAX_MTIMED]; /*!< The array to process dungeon monsters[max_m_idx] */
+       s16b mproc_max[MAX_MTIMED]; /*!< Number of monsters to be processed */
+
+       POSITION_IDX lite_n; //!< Array of grids lit by player lite (see "current_floor_ptr->grid_array.c")
+       POSITION lite_y[LITE_MAX];
+       POSITION lite_x[LITE_MAX];
+
+       POSITION_IDX mon_lite_n; //!< Array of grids lit by player lite (see "current_floor_ptr->grid_array.c")
+       POSITION mon_lite_y[MON_LITE_MAX];
+       POSITION mon_lite_x[MON_LITE_MAX];
+
+       POSITION_IDX view_n; //!< Array of grids viewable to the player (see "grid_array")
+       POSITION view_y[VIEW_MAX];
+       POSITION view_x[VIEW_MAX];
+
+       POSITION_IDX redraw_n; //!< Array of grids for delayed visual updating (see "current_floor_ptr->grid_array.c")
+       POSITION redraw_y[REDRAW_MAX];
+       POSITION redraw_x[REDRAW_MAX];
+
+} floor_type;
+
 #define DUNGEON_MODE_NONE       0
 #define DUNGEON_MODE_AND        1
 #define DUNGEON_MODE_NAND       2
@@ -257,3 +297,5 @@
 #define permanent_wall(F) \
        (have_flag((F)->flags, FF_WALL) && \
         have_flag((F)->flags, FF_PERMANENT))
+
+extern floor_type *current_floor_ptr;
\ No newline at end of file

diff --git a/src/init.c b/src/init.c
index d814689..59cf6ea 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -44,6 +44,7 @@
 #include "dungeon-file.h"
 #include "files.h"
 #include "feature.h"
+#include "floor.h"
 
 #ifndef MACINTOSH
 #ifdef CHECK_MODIFICATION_TIME

diff --git a/src/main-win.c b/src/main-win.c
index d21c8d1..75a8278 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -101,6 +101,7 @@
 #include "util.h"
 
 #include "view-mainwindow.h"
+#include "floor.h"
 #include "floor-events.h"
 #include "init.h"
 #include "files.h"

diff --git a/src/monsterrace-hook.c b/src/monsterrace-hook.c
index 3f56104..63857a6 100644 (file)
--- a/src/monsterrace-hook.c
+++ b/src/monsterrace-hook.c
@@ -4,6 +4,7 @@
 #include "monsterrace-hook.h"
 #include "monster.h"
 #include "monster-spell.h"
+#include "floor.h"
 
 /*! 通常pit生成時のモンスターの構成条件ID / Race index for "monster pit (clone)" */
 int vault_aux_race;

diff --git a/src/mutation.c b/src/mutation.c
index d02daf6..a37302f 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -26,6 +26,7 @@
 #include "spells.h"
 #include "cmd-basic.h"
 #include "files.h"
+#include "floor.h"
 
 /*!
  * @brief プレイヤーに突然変異を与える

diff --git a/src/patron.c b/src/patron.c
index 8d6cb4a..41da7f5 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -17,6 +17,7 @@
 #include "spells-summon.h"
 #include "spells-object.h"
 #include "spells-status.h"
+#include "floor.h"
 
 #ifdef JP
 /*!

diff --git a/src/player-effects.c b/src/player-effects.c
index a19853a..12473a5 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -15,6 +15,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "floor.h"
 #include "bldg.h"
 #include "birth.h"
 #include "grid.h"

diff --git a/src/realm-life.c b/src/realm-life.c
index c574151..65fdc51 100644 (file)
--- a/src/realm-life.c
+++ b/src/realm-life.c
@@ -5,6 +5,7 @@
 #include "spells.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "floor.h"
 
 /*!
 * @brief 生命領域魔法の各処理を行う

diff --git a/src/rooms-city.c b/src/rooms-city.c
index 5634d24..fb2f524 100644 (file)
--- a/src/rooms-city.c
+++ b/src/rooms-city.c
@@ -2,6 +2,7 @@
 #include "util.h"
 
 #include "grid.h"
+#include "floor.h"
 #include "floor-generate.h"
 #include "rooms.h"
 #include "rooms-city.h"

diff --git a/src/save.c b/src/save.c
index 3e5fc63..80223ab 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -18,6 +18,7 @@
 #include "quest.h"
 #include "store.h"
 #include "wild.h"
+#include "floor.h"
 #include "floor-events.h"
 #include "floor-save.h"
 #include "files.h"

diff --git a/src/scores.c b/src/scores.c
index c9961cb..1832acd 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -16,6 +16,7 @@
 #include "player-status.h"
 #include "files.h"
 #include "scores.h"
+#include "floor.h"
 
 /*!
  * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file

diff --git a/src/sort.c b/src/sort.c
index 5de5a95..9105ecb 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "sort.h"
+#include "floor.h"
 #include "quest.h"
 
 /*

diff --git a/src/spells-summon.c b/src/spells-summon.c
index 6308034..e6031cc 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -3,6 +3,7 @@
 
 #include "spells-summon.h"
 #include "monster-status.h"
+#include "floor.h"
 
 /*!
 * @brief トランプ魔法独自の召喚処理を行う / Handle summoning and failure of trump spells

diff --git a/src/types.h b/src/types.h
index 445c98e..ee8b516 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -2117,45 +2117,6 @@ typedef struct {
 } dragonbreath_type;
 
 typedef struct {
-       grid_type *grid_array[MAX_HGT];
-       DEPTH dun_level;                /*!< 現在の実ダンジョン階層base_levelの参照元となる / Current dungeon level */
-       DEPTH base_level;               /*!< 基本生成レベル、後述のobject_level, monster_levelの参照元となる / Base dungeon level */
-       DEPTH object_level;             /*!< アイテムの生成レベル、current_floor_ptr->base_levelを起点に一時変更する時に参照 / Current object creation level */
-       DEPTH monster_level;    /*!< モンスターの生成レベル、current_floor_ptr->base_levelを起点に一時変更する時に参照 / Current monster creation level */
-       POSITION width;                 /* Current dungeon width */
-       POSITION height;                /* Current dungeon height */
-       MONSTER_NUMBER num_repro; /*!< Current reproducer count */
-
-       GAME_TURN generated_turn; /* Turn when level began */
-
-       object_type *o_list; /*!< The array of dungeon items [current_floor_ptr->max_o_idx] */
-       OBJECT_IDX max_o_idx; /*!< Maximum number of objects in the level */
-
-       monster_type *m_list; /*!< The array of dungeon monsters [current_floor_ptr->max_m_idx] */
-       MONSTER_IDX max_m_idx; /*!< Maximum number of monsters in the level */
-
-       s16b *mproc_list[MAX_MTIMED]; /*!< The array to process dungeon monsters[max_m_idx] */
-       s16b mproc_max[MAX_MTIMED]; /*!< Number of monsters to be processed */
-
-       POSITION_IDX lite_n; //!< Array of grids lit by player lite (see "current_floor_ptr->grid_array.c")
-       POSITION lite_y[LITE_MAX];
-       POSITION lite_x[LITE_MAX];
-
-       POSITION_IDX mon_lite_n; //!< Array of grids lit by player lite (see "current_floor_ptr->grid_array.c")
-       POSITION mon_lite_y[MON_LITE_MAX];
-       POSITION mon_lite_x[MON_LITE_MAX];
-
-       POSITION_IDX view_n; //!< Array of grids viewable to the player (see "grid_array")
-       POSITION view_y[VIEW_MAX];
-       POSITION view_x[VIEW_MAX];
-
-       POSITION_IDX redraw_n; //!< Array of grids for delayed visual updating (see "current_floor_ptr->grid_array.c")
-       POSITION redraw_y[REDRAW_MAX];
-       POSITION redraw_x[REDRAW_MAX];
-
-} floor_type;
-
-typedef struct {
        POSITION max_wild_x; /*!< Maximum size of the wilderness */
        POSITION max_wild_y; /*!< Maximum size of the wilderness */
        GAME_TURN game_turn;                    /*!< 画面表示上のゲーム時間基準となるターン / Current game turn */

diff --git a/src/util.c b/src/util.c
index 11f0a45..f681b3a 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -15,6 +15,7 @@
 #include "monsterrace-hook.h"
 #include "view-mainwindow.h"
 #include "quest.h"
+#include "floor.h"
 
 
 static int num_more = 0;

diff --git a/src/variable.c b/src/variable.c
index 8c90397..cff6ebf 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -429,15 +429,6 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
        "ambush",
 };
 
-
-/*
- * The array of "current_floor_ptr->grid_array grids" [MAX_WID][MAX_HGT].
- * Not completely allocated, that would be inefficient
- * Not completely hardcoded, that would overflow memory
- */
-floor_type floor_info;
-floor_type *current_floor_ptr = &floor_info;
-
 /*
  * The array of saved floors
  */