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

diff --git a/src/externs.h b/src/externs.h
index f2cba59..0ac58d7 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -521,15 +521,15 @@ extern bool monk_armour_aux;
 extern bool monk_notify_aux;
 extern wilderness_type **wilderness;
 extern building_type building[MAX_BLDG];
-extern IDX max_quests;
+extern QUEST_IDX max_quests;
 extern MONRACE_IDX max_r_idx;
 extern IDX max_k_idx;
 extern IDX max_v_idx;
 extern IDX max_f_idx;
 extern IDX max_a_idx;
 extern IDX max_e_idx;
-extern IDX max_d_idx;
-extern IDX max_o_idx;
+extern DUNGEON_IDX max_d_idx;
+extern OBJECT_IDX max_o_idx;
 extern MONSTER_IDX max_m_idx;
 extern POSITION max_wild_x;
 extern POSITION max_wild_y;

diff --git a/src/snipe.c b/src/snipe.c
index 12b07af..b0e1c00 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -356,7 +356,7 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
                ask = isupper(choice);
 
                /* Lowercase */
-               if (ask) choice = tolower(choice);
+               if (ask) choice = (char)tolower(choice);
 
                /* Extract request */
                i = (islower(choice) ? A2I(choice) : -1);

diff --git a/src/variable.c b/src/variable.c
index bee1154..dcf3724 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -1049,7 +1049,7 @@ building_type building[MAX_BLDG];
 /*
  * Maximum number of quests
  */
-IDX max_quests;
+QUEST_IDX max_quests;
 
 /*
  * Maximum number of monsters in r_info.txt
@@ -1059,7 +1059,7 @@ MONRACE_IDX max_r_idx;
 /*
  * Maximum number of items in k_info.txt
  */
-IDX max_k_idx;
+KIND_OBJECT_IDX max_k_idx;
 
 /*
  * Maximum number of vaults in v_info.txt
@@ -1084,12 +1084,12 @@ IDX max_e_idx;
 /*
  * Maximum number of dungeon in e_info.txt
  */
-IDX max_d_idx;
+DUNGEON_IDX max_d_idx;
 
 /*
  * Maximum number of objects in the level
  */
-IDX max_o_idx;
+OBJECT_IDX max_o_idx;
 
 /*
  * Maximum number of monsters in the level