#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

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

diff --git a/src/variable.c b/src/variable.c
index 0f379c4..8f48d22 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -140,7 +140,7 @@ bool inkey_scan;            /* See the "inkey()" function */
 bool inkey_flag;               /* See the "inkey()" function */
 bool get_com_no_macros = FALSE;        /* Expand macros in "get_com" or not */
 
-s16b coin_type;                        /* Hack -- force coin type */
+OBJECT_SUBTYPE_VALUE coin_type;        /* Hack -- force coin type */
 
 bool opening_chest;            /* Hack -- prevent chest generation */
 
@@ -1026,7 +1026,7 @@ monster_hook_type get_mon_num2_hook;
 /*
  * Hack -- function hook to restrict "get_obj_num_prep()" function
  */
-bool (*get_obj_num_hook)(int k_idx);
+bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 
 
 /* Hack, monk armour */
@@ -1152,8 +1152,8 @@ int battle_odds;
 int kakekin;
 u32b mon_odds[4];
 
-int pet_t_m_idx;
-int riding_t_m_idx;
+MONSTER_IDX pet_t_m_idx;
+MONSTER_IDX riding_t_m_idx;
 
 IDX kubi_r_idx[MAX_KUBI];
 IDX today_mon;
@@ -1262,7 +1262,7 @@ FEAT_IDX feat_wall_solid;
 FEAT_IDX floor_type[100], fill_type[100];
 
 bool now_damaged;
-s16b now_message;
+COMMAND_CODE now_message;
 bool use_menu;
 
 #ifdef CHUUKEI