From 819e90a6a18b4ef95f59066cb339428c9be1902b Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Sat, 30 Sep 2017 17:32:23 +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/cmd1.c    |  4 ++--
 src/cmd2.c    |  2 +-
 src/cmd4.c    |  5 +++--
 src/cmd5.c    |  4 ++--
 src/cmd6.c    |  6 +++---
 src/externs.h |  6 +++---
 src/load.c    | 22 +++++++++++++++++-----
 src/object2.c | 11 ++++++-----
 src/racial.c  |  2 +-
 src/types.h   |  4 ++--
 src/wizard2.c |  2 +-
 src/xtra1.c   |  6 +++---
 src/xtra2.c   |  4 ++--
 13 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/src/cmd1.c b/src/cmd1.c
index 8bacc4f70..1b336f4e8 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1648,8 +1648,8 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
 	{
 		if ((r_ptr->level + 10) > p_ptr->lev)
 		{
-			int tval = inventory[INVEN_RARM+hand].tval - TV_WEAPON_BEGIN;
-			int sval = inventory[INVEN_RARM+hand].sval;
+			OBJECT_TYPE_VALUE tval = inventory[INVEN_RARM+hand].tval - TV_WEAPON_BEGIN;
+			OBJECT_SUBTYPE_VALUE sval = inventory[INVEN_RARM+hand].sval;
 			int now_exp = p_ptr->weapon_exp[tval][sval];
 			if (now_exp < s_info[p_ptr->pclass].w_max[tval][sval])
 			{
diff --git a/src/cmd2.c b/src/cmd2.c
index 0f7ef19d5..a1e7fa426 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3487,7 +3487,7 @@ void do_cmd_fire_aux(int item, object_type *j_ptr)
 				int now_exp = p_ptr->weapon_exp[0][j_ptr->sval];
 				if (now_exp < s_info[p_ptr->pclass].w_max[0][j_ptr->sval])
 				{
-					int amount = 0;
+					SUB_EXP amount = 0;
 					if (now_exp < WEAPON_EXP_BEGINNER) amount = 80;
 					else if (now_exp < WEAPON_EXP_SKILLED) amount = 25;
 					else if ((now_exp < WEAPON_EXP_EXPERT) && (p_ptr->lev > 19)) amount = 10;
diff --git a/src/cmd4.c b/src/cmd4.c
index 88d658bc5..3ed8cb08c 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -3384,7 +3384,7 @@ void do_cmd_visuals(void)
 		case '4':
 		{
 			static cptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars");
-			static int r = 0;
+			static IDX r = 0;
 
 			prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
 
@@ -4645,7 +4645,8 @@ static cptr feature_group_text[] =
  */
 static int collect_features(int grp_cur, IDX *feat_idx, BIT_FLAGS8 mode)
 {
-	int i, feat_cnt = 0;
+	IDX i;
+	int feat_cnt = 0;
 
 	/* Unused;  There is a single group. */
 	(void)grp_cur;
diff --git a/src/cmd5.c b/src/cmd5.c
index c9cb19c9e..0c319832e 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -18,7 +18,7 @@
  * @param tval 魔法書のtval
  * @return 領域魔法の技能名称を保管した文字列ポインタ
  */
-cptr spell_category_name(int tval)
+cptr spell_category_name(OBJECT_TYPE_VALUE tval)
 {
 	switch (tval)
 	{
@@ -64,7 +64,7 @@ bool select_the_force = FALSE;
  * The "known" should be TRUE for cast/pray, FALSE for study
  * </pre>
  */
-static int get_spell(int *sn, cptr prompt, int sval, bool learned, int use_realm)
+static int get_spell(int *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, int use_realm)
 {
 	int         i;
 	int         spell = -1;
diff --git a/src/cmd6.c b/src/cmd6.c
index 4f3a775a7..4e8109416 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -2048,7 +2048,7 @@ void do_cmd_read_scroll(void)
  * @param known 判明済ならばTRUE
  * @return 発動により効果内容が確定したならばTRUEを返す
  */
-static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, bool known)
+static int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known)
 {
 	int k;
 	int ident = FALSE;
@@ -2575,7 +2575,7 @@ void do_cmd_use_staff(void)
  * @param magic 魔道具術上の処理ならばTRUE
  * @return 発動により効果内容が確定したならばTRUEを返す
  */
-static int wand_effect(int sval, int dir, bool powerful, bool magic)
+static int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool magic)
 {
 	int ident = FALSE;
 	int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
@@ -3050,7 +3050,7 @@ void do_cmd_aim_wand(void)
  * @param magic 魔道具術上の処理ならばTRUE
  * @return 発動により効果内容が確定したならばTRUEを返す
  */
-static int rod_effect(int sval, int dir, bool *use_charge, bool powerful, bool magic)
+static int rod_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool *use_charge, bool powerful, bool magic)
 {
 	int ident = FALSE;
 	int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;
diff --git a/src/externs.h b/src/externs.h
index 9ac09e928..4cf58be3b 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -792,7 +792,7 @@ extern void do_cmd_checkquest(void);
 extern void do_cmd_time(void);
 
 /* cmd5.c */
-extern cptr spell_category_name(int tval);
+extern cptr spell_category_name(OBJECT_TYPE_VALUE tval);
 extern void do_cmd_browse(void);
 extern void do_cmd_study(void);
 extern void do_cmd_cast(void);
@@ -1513,8 +1513,8 @@ extern void do_poly_wounds(void);
 extern void change_race(CHARACTER_IDX new_race, cptr effect_msg);
 extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear);
 extern s16b gain_energy(void);
-extern s16b bow_energy(int sval);
-extern int bow_tmul(int sval);
+extern s16b bow_energy(OBJECT_SUBTYPE_VALUE sval);
+extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval);
 extern cptr your_alignment(void);
 extern int weapon_exp_level(int weapon_exp);
 extern int riding_exp_level(int riding_exp);
diff --git a/src/load.c b/src/load.c
index 8e7ed731e..70cc4af84 100644
--- a/src/load.c
+++ b/src/load.c
@@ -386,8 +386,10 @@ static void rd_item_old(object_type *o_ptr)
 
 	rd_s16b(&o_ptr->ac);
 
-	rd_byte(&o_ptr->dd);
-	rd_byte(&o_ptr->ds);
+	rd_byte(&tmp8u);
+	o_ptr->dd = tmp8u;
+	rd_byte(&tmp8u);
+	o_ptr->ds = tmp8u;
 
 	rd_byte(&o_ptr->ident);
 
@@ -674,9 +676,17 @@ static void rd_item(object_type *o_ptr)
 	if (flags & SAVE_ITEM_AC) rd_s16b(&o_ptr->ac);
 	else o_ptr->ac = 0;
 
-	if (flags & SAVE_ITEM_DD) rd_byte(&o_ptr->dd);
+	if (flags & SAVE_ITEM_DD)
+	{
+		 rd_byte(&tmp8u);
+		 o_ptr->dd = tmp8u;
+	}
 	else o_ptr->dd = 0;
-	if (flags & SAVE_ITEM_DS) rd_byte(&o_ptr->ds);
+	if (flags & SAVE_ITEM_DS)
+	{
+		rd_byte(&tmp8u);
+		o_ptr->ds = tmp8u;
+	}
 	else o_ptr->ds = 0;
 
 	if (flags & SAVE_ITEM_IDENT) rd_byte(&o_ptr->ident);
@@ -3364,6 +3374,7 @@ static errr rd_savefile_new_aux(void)
 
 	byte tmp8u;
 	u16b tmp16u;
+	s16b tmp16s;
 	u32b tmp32u;
 
 #ifdef VERIFY_CHECKSUMS
@@ -3531,7 +3542,8 @@ static errr rd_savefile_new_aux(void)
 				quest_type* const q_ptr = &quest[i];
 				
 				rd_s16b(&q_ptr->status);
-				rd_s16b(&q_ptr->level);
+				rd_s16b(&tmp16s);
+				q_ptr->level = tmp16s;
 
 				if (z_older_than(11, 0, 6))
 				{
diff --git a/src/object2.c b/src/object2.c
index eec9f6623..ffe8304bd 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -7721,7 +7721,8 @@ static void drain_essence(void)
 	int i, item;
 	int dec = 4;
 	bool observe = FALSE;
-	int old_ds, old_dd, old_to_h, old_to_d, old_ac, old_to_a, old_pval, old_name2, old_timeout;
+	int old_ds, old_dd, old_to_h, old_to_d, old_ac, old_to_a, old_pval, old_name2;
+	TIME_EFFECT old_timeout;
 	u32b old_flgs[TR_FLAG_SIZE], new_flgs[TR_FLAG_SIZE];
 	object_type *o_ptr;
 	cptr q, s;
@@ -7828,7 +7829,7 @@ static void drain_essence(void)
 	for (i = 0; essence_info[i].add_name; i++)
 	{
 		essence_type *es_ptr = &essence_info[i];
-		int pval = 0;
+		PARAMETER_VALUE pval = 0;
 
 		if (es_ptr->add < TR_FLAG_MAX && is_pval_flag(es_ptr->add) && old_pval)
 			pval = (have_flag(new_flgs, es_ptr->add)) ? old_pval - o_ptr->pval : old_pval;
@@ -8422,14 +8423,14 @@ static void add_essence(int mode)
 			{
 				char tmp[80];
 				char tmp_val[160];
-				int pval;
-				int limit = MIN(5, p_ptr->magic_num1[es_ptr->essence]/es_ptr->value);
+				PARAMETER_VALUE pval;
+				PARAMETER_VALUE limit = MIN(5, p_ptr->magic_num1[es_ptr->essence]/es_ptr->value);
 
 				sprintf(tmp, _("いくつ付加しますか？ (1-%d): ", "Enchant how many? (1-%d): "), limit);
 				strcpy(tmp_val, "1");
 
 				if (!get_string(tmp, tmp_val, 1)) return;
-				pval = atoi(tmp_val);
+				pval = (PARAMETER_VALUE)atoi(tmp_val);
 				if (pval > limit) pval = limit;
 				else if (pval < 1) pval = 1;
 				o_ptr->pval += pval;
diff --git a/src/racial.c b/src/racial.c
index b9e6da973..aef371354 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -264,7 +264,7 @@ static bool do_cmd_archer(void)
 bool gain_magic(void)
 {
 	int item;
-	int pval;
+	PARAMETER_VALUE pval;
 	int ext = 0;
 	cptr q, s;
 	object_type *o_ptr;
diff --git a/src/types.h b/src/types.h
index 6cdc219c4..6dde1b2b5 100644
--- a/src/types.h
+++ b/src/types.h
@@ -600,8 +600,8 @@ struct monster_type
 
 	POSITION cdis;		/* Current dis from player */
 
-	BIT_FLAGS mflag;		/* Extra monster flags */
-	BIT_FLAGS mflag2;	/* Extra monster flags */
+	BIT_FLAGS8 mflag;	/* Extra monster flags */
+	BIT_FLAGS8 mflag2;	/* Extra monster flags */
 
 	bool ml;		/* Monster is "visible" */
 
diff --git a/src/wizard2.c b/src/wizard2.c
index 4348ff8f0..ba0fd65ec 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -749,7 +749,7 @@ static int wiz_create_itemtype(void)
 {
 	int i, num, max_num;
 	int col, row;
-	int tval;
+	OBJECT_TYPE_VALUE tval;
 
 	cptr tval_desc;
 	char ch;
diff --git a/src/xtra1.c b/src/xtra1.c
index 2714864a2..cfb6e7475 100644
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3116,7 +3116,7 @@ s16b calc_num_fire(object_type *o_ptr)
 	int extra_shots = 0;
 	int i;
 	int num = 0;
-	int tval_ammo = bow_tval_ammo(o_ptr);
+	OBJECT_TYPE_VALUE tval_ammo = bow_tval_ammo(o_ptr);
 	object_type *q_ptr;
 	u32b flgs[TR_FLAG_SIZE];
 	
@@ -5428,8 +5428,8 @@ void calc_bonuses(void)
 	{
 		if (buki_motteruka(INVEN_RARM+i))
 		{
-			int tval = inventory[INVEN_RARM+i].tval - TV_WEAPON_BEGIN;
-			int sval = inventory[INVEN_RARM+i].sval;
+			OBJECT_TYPE_VALUE tval = inventory[INVEN_RARM+i].tval - TV_WEAPON_BEGIN;
+			OBJECT_SUBTYPE_VALUE sval = inventory[INVEN_RARM+i].sval;
 
 			p_ptr->to_h[i] += (p_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
 			p_ptr->dis_to_h[i] += (p_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
diff --git a/src/xtra2.c b/src/xtra2.c
index 4c7159529..905814b80 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -5535,7 +5535,7 @@ s16b gain_energy(void)
 /*
  * Return bow energy 
  */
-s16b bow_energy(int sval)
+s16b bow_energy(OBJECT_SUBTYPE_VALUE sval)
 {
 	int energy = 100;
 
@@ -5592,7 +5592,7 @@ s16b bow_energy(int sval)
 /*
  * Return bow tmul
  */
-int bow_tmul(int sval)
+int bow_tmul(OBJECT_SUBTYPE_VALUE sval)
 {
 	int tmul = 0;
 
-- 
2.11.0