[Refactor] #38993 cur_wid/hgt を floor_type に取り込み width/heightに改名。 / Move cur_wid...

[hengband/hengband.git] / src / variable.c

diff --git a/src/variable.c b/src/variable.c
index b786e18..8670d32 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -111,13 +111,9 @@ bool msg_flag;                     /* Used in msg_print() for "buffering" */
 s16b running;                  /* Current counter for running, if any */
 GAME_TURN resting;                     /* Current counter for resting, if any */
 
-POSITION cur_hgt;              /* Current dungeon height */
-POSITION cur_wid;              /* Current dungeon width */
-DEPTH dun_level;               /*!< 現在の実ダンジョン階層、base_levelの参照元となる / Current dungeon level */
 MONSTER_NUMBER num_repro; /*!< Current reproducer count */
-DEPTH base_level;              /*!< 基本生成レベル、後述のobject_level, monster_levelの参照元となる / Base dungeon level */
-DEPTH object_level;            /*!< アイテムの生成レベル、base_levelを起点に一時変更する時に参照 / Current object creation level */
-DEPTH monster_level;   /*!< モンスターの生成レベル、base_levelを起点に一時変更する時に参照 / Current monster creation 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 */
 bool invoking_midnight_curse; /*!< 悪夢モード時の真夜中太古の呪い発生処理フラグ */
 
 GAME_TURN turn;                                /*!< 画面表示上のゲーム時間基準となるターン / Current game turn */
@@ -219,23 +215,23 @@ char player_base[32];
 char savefile[1024];
 char savefile_base[40];
 
-POSITION_IDX lite_n; //!< Array of grids lit by player lite (see "cave.c")
+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 "cave.c")
+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 "cave.c")
+POSITION_IDX view_n; //!< Array of grids viewable to the player (see "current_floor_ptr->grid_array.c")
 POSITION view_y[VIEW_MAX];
 POSITION view_x[VIEW_MAX];
 
-POSITION_IDX temp_n; //!< Array of grids for use by various functions (see "cave.c")
+POSITION_IDX temp_n; //!< Array of grids for use by various functions (see "current_floor_ptr->grid_array.c")
 POSITION temp_y[TEMP_MAX];
 POSITION temp_x[TEMP_MAX];
 
-POSITION_IDX redraw_n = 0; //!< Array of grids for delayed visual updating (see "cave.c")
+POSITION_IDX redraw_n = 0; //!< Array of grids for delayed visual updating (see "current_floor_ptr->grid_array.c")
 POSITION redraw_y[REDRAW_MAX];
 POSITION redraw_x[REDRAW_MAX];
 
@@ -461,11 +457,13 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
 
 
 /*
- * The array of "cave grids" [MAX_WID][MAX_HGT].
+ * 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
  */
-cave_type *cave[MAX_HGT];
+floor_type floor;
+floor_type *current_floor_ptr = &floor;
+
 
 
 /*
@@ -507,12 +505,12 @@ s16b mproc_max[MAX_MTIMED]; /* Number of monsters to be processed */
 /*
  * Maximum number of towns
  */
-u16b max_towns;
+TOWN_IDX max_towns;
 
 /*
  * The towns [max_towns]
  */
-town_type *town;
+town_type *town_info;
 
 
 /*
@@ -653,7 +651,7 @@ char *r_text;
 /*
  * The dungeon arrays
  */
-dungeon_info_type *d_info;
+dungeon_type *d_info;
 char *d_name;
 char *d_text;
 
@@ -724,11 +722,6 @@ monsterrace_hook_type get_mon_num2_hook;
 bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 
 
-/* Hack, monk armour */
-bool monk_armour_aux;
-bool monk_notify_aux;
-
-
 /*
  * Wilderness
  */