[Refactor] #37353 BLOCK_HGT と BLOCK_WID を floor.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 5b15175..c7e7399 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -40,18 +40,6 @@
 
 
 /*!
- * @brief generate.cで用いられる基本的なブロック数単位(垂直方向)
- * Number of grids in each block (vertically) Probably hard-coded to 11, see "generate.c"
- */
-#define BLOCK_HGT 11
-
-/*!
- * @brief generate.cで用いられる基本的なブロック数単位(水平方向)
- * Number of grids in each block (horizontally) Probably hard-coded to 11, see "generate.c"
- */
-#define BLOCK_WID 11
-
-/*!
  * @brief 表示上の基本的なパネル単位(垂直方向、BLOCK_HGTの倍数で設定すること)
  * Number of grids in each panel (vertically) Must be a multiple of BLOCK_HGT
  */

diff --git a/src/floor.h b/src/floor.h
index a6a018f..eac919f 100644 (file)
--- a/src/floor.h
+++ b/src/floor.h
@@ -3,6 +3,18 @@
 #include "feature.h"
 #include "grid.h"
 
+/*!
+ * @brief generate.cで用いられる基本的なブロック数単位(垂直方向)
+ * Number of grids in each block (vertically) Probably hard-coded to 11, see "generate.c"
+ */
+#define BLOCK_HGT 11
+
+ /*!
+  * @brief generate.cで用いられる基本的なブロック数単位(水平方向)
+  * Number of grids in each block (horizontally) Probably hard-coded to 11, see "generate.c"
+  */
+#define BLOCK_WID 11
+
 typedef struct {
        grid_type *grid_array[MAX_HGT];
        DEPTH dun_level;                /*!< 現在の実ダンジョン階層base_levelの参照元となる / Current dungeon level */