[Refactor] #38993 num_repro を floor_type に取り込む。 / Move num_repro to floor_type structure.

[hengband/hengband.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 98ba273..41d477d 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -427,7 +427,7 @@ struct skill_table
 /*
  * A single "grid" in a Cave
  *
- * Note that several aspects of the code restrict the actual grid_array
+ * Note that several aspects of the code restrict the actual current_floor_ptr->grid_array
  * to a max size of 256 by 256.  In partcular, locations are often
  * saved as bytes, limiting each coordinate to the 0-255 range.
  *
@@ -454,13 +454,13 @@ typedef struct grid_type grid_type;
 
 struct grid_type
 {
-       BIT_FLAGS info;         /* Hack -- grid_array flags */
+       BIT_FLAGS info;         /* Hack -- current_floor_ptr->grid_array flags */
 
        FEAT_IDX feat;          /* Hack -- feature type */
        OBJECT_IDX o_idx;               /* Object in this grid */
        MONSTER_IDX m_idx;              /* Monster in this grid */
 
-       /*! 地形の特別な情報を保存する / Special grid_array info
+       /*! 地形の特別な情報を保存する / Special current_floor_ptr->grid_array info
         * 具体的な使用一覧はクエスト行き階段の移行先クエストID、
         * 各ダンジョン入口の移行先ダンジョンID、
         * 
@@ -1020,7 +1020,7 @@ struct player_type
 
        PLAYER_LEVEL lev;                       /* Level */
 
-       s16b town_num;                  /* Current town number */
+       TOWN_IDX town_num;                      /* Current town number */
        s16b arena_number;              /* monster number in arena -KMW- */
        bool inside_arena;              /* Is character inside arena? */
        QUEST_IDX inside_quest;         /* Inside quest level */
@@ -1647,7 +1647,7 @@ typedef struct wilderness_type wilderness_type;
 struct wilderness_type
 {
        int terrain;
-       int town;
+       TOWN_IDX town;
        int road;
        u32b seed;
        DEPTH level;
@@ -1873,3 +1873,12 @@ typedef struct {
        int type;
        concptr name;
 } dragonbreath_type;
+
+typedef struct {
+       grid_type *grid_array[MAX_HGT];
+       DEPTH dun_level;                /*!< 現在の実ダンジョン階層base_levelの参照元となる / Current dungeon level */
+       DEPTH base_level;
+       POSITION width;                 /* Current dungeon width */
+       POSITION height;                /* Current dungeon height */
+       MONSTER_NUMBER num_repro; /*!< Current reproducer count */
+} floor_type;
\ No newline at end of file