[Refactor] #37353 型の置換 / Type replacement.

diff --git a/src/externs.h b/src/externs.h
index 7353606..47f3c4b 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -345,11 +345,11 @@ extern wilderness_type **wilderness;
 extern building_type building[MAX_BLDG];
 extern QUEST_IDX max_q_idx;
 extern MONRACE_IDX max_r_idx;
-extern IDX max_k_idx;
-extern IDX max_v_idx;
-extern IDX max_f_idx;
+extern KIND_OBJECT_IDX max_k_idx;
+extern VAULT_IDX max_v_idx;
+extern FEAT_IDX max_f_idx;
 extern ARTIFACT_IDX max_a_idx;
-extern IDX max_e_idx;
+extern EGO_IDX max_e_idx;
 extern DUNGEON_IDX max_d_idx;
 extern OBJECT_IDX max_o_idx;
 extern MONSTER_IDX max_m_idx;

diff --git a/src/h-type.h b/src/h-type.h
index 718fbbd..1add3ea 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -134,6 +134,7 @@ typedef s16b INVENTORY_IDX;         /*!< ゲーム中の所持品ID型を定義 */
 typedef s16b OBJECT_IDX;               /*!< ゲーム中のアイテムID型を定義 */
 typedef s32b ESSENCE_IDX;              /*!< 鍛冶エッセンスのID型 */
 typedef s16b KIND_OBJECT_IDX;  /*!< ゲーム中のベースアイテムID型を定義 */
+typedef s16b VAULT_IDX;                        /*!< 固定部屋のID型を定義 */
 
 typedef s32b POSITION;                 /*!< ゲーム中の座標型を定義 */
 typedef s16b POSITION_IDX;             /*!< ゲーム中の座標リストID型 */

diff --git a/src/variable.c b/src/variable.c
index a44d46a..fe31bb7 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -760,7 +760,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 +775,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