From 48efdf7de27ef76db90a5e9513cfefe831f4a9cd Mon Sep 17 00:00:00 2001 From: Deskull Date: Tue, 5 Dec 2017 22:11:26 +0900 Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20=E5=9E=8B?= =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?= =?utf8?q?=E3=80=82=20/=20Ongoing=20type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 6 +++--- src/snipe.c | 2 +- src/variable.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/externs.h b/src/externs.h index f2cba59c3..0ac58d761 100644 --- 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 12b07af3a..b0e1c00f7 100644 --- 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 bee11548a..dcf372483 100644 --- 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 -- 2.11.0