[Refactor] #37353 コメント整理。 / Refactor comments.

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

diff --git a/src/variable.c b/src/variable.c
index 1a16ec1..420d164 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -25,7 +25,6 @@ const concptr copyright[5] =
        "are included in all such copies."
 };
 
-
 int max_macrotrigger = 0; /*!< 現在登録中のマクロ(トリガー)の数 */
 concptr macro_template = NULL; /*!< Angband設定ファイルのT: タグ情報から読み込んだ長いTコードを処理するために利用する文字列ポインタ */
 concptr macro_modifier_chr; /*!< &x# で指定されるマクロトリガーに関する情報を記録する文字列ポインタ */
@@ -46,7 +45,7 @@ autopick_type *autopick_list = NULL; /*!< 自動拾い/破壊設定構造体の
 /*
  * Savefile version
  */
-byte h_ver_major;       /* Savefile version for Hengband 1.1.1 and later */
+byte h_ver_major; /* Savefile version for Hengband 1.1.1 and later */
 byte h_ver_minor;
 byte h_ver_patch;
 byte h_ver_extra;
@@ -157,8 +156,8 @@ bool hack_mutation;
 s16b inven_cnt; /* Number of items in inventory */
 s16b equip_cnt; /* Number of items in equipment */
 
-s16b o_max = 1; /* Number of allocated objects */
-s16b o_cnt = 0; /* Number of live objects */
+OBJECT_IDX o_max = 1; /* Number of allocated objects */
+OBJECT_IDX o_cnt = 0; /* Number of live objects */
 
 MONSTER_IDX m_max = 1; /* Number of allocated monsters */
 MONSTER_IDX m_cnt = 0; /* Number of live monsters */
@@ -195,7 +194,7 @@ POSITION panel_col_prt, panel_row_prt;
 /*
  * Targetting variables
  */
-IDX target_who;
+MONSTER_IDX target_who;
 POSITION target_col;
 POSITION target_row;
 
@@ -478,7 +477,7 @@ saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 /*
  * Number of floor_id used from birth
  */
-s16b max_floor_id;
+FLOOR_IDX max_floor_id;
 
 
 /*
@@ -760,7 +759,7 @@ KIND_OBJECT_IDX max_k_idx;
 /*
  * Maximum number of vaults in v_info.txt
  */
-IDX max_v_idx;
+VAULT_IDX max_v_idx;
 
 /*
  * Maximum number of terrain features in f_info.txt
@@ -775,7 +774,7 @@ ARTIFACT_IDX max_a_idx;
 /*
  * Maximum number of ego-items in e_info.txt
  */
-IDX max_e_idx;
+EGO_IDX max_e_idx;
 
 /*
  * Maximum number of dungeon in e_info.txt
@@ -834,7 +833,6 @@ int mutant_regenerate_mod = 100;
 bool can_save = FALSE;        /* Game can be saved */
 
 s16b world_monster;
-bool world_player;
 
 int cap_mon;
 int cap_mspeed;
@@ -882,9 +880,6 @@ FEAT_IDX feat_glyph;
 FEAT_IDX feat_explosive_rune;
 FEAT_IDX feat_mirror;
 
-/* Doors */
-door_type feat_door[MAX_DOOR_TYPES];
-
 /* Stairs */
 FEAT_IDX feat_up_stair;
 FEAT_IDX feat_down_stair;
@@ -961,7 +956,7 @@ DEPTH *max_dlv;
 FEAT_IDX feat_wall_outer;
 FEAT_IDX feat_wall_inner;
 FEAT_IDX feat_wall_solid;
-FEAT_IDX floor_type[100], fill_type[100];
+FEAT_IDX feat_ground_type[100], feat_wall_type[100];
 
 bool now_damaged;
 COMMAND_CODE now_message;