From 55152c4da35a59498d59e8be2fdd60ea8150b79a Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Tue, 26 Sep 2017 15:18:39 +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/bldg.c     |  6 +++---
 src/cave.c     | 26 +++++++++++++-------------
 src/cmd4.c     |  2 +-
 src/cmd5.c     |  2 +-
 src/externs.h  | 18 +++++++++---------
 src/files.c    |  7 ++-----
 src/grid.c     |  3 +--
 src/monster2.c |  4 ++--
 src/object2.c  |  9 +++++----
 src/racial.c   |  2 +-
 src/spells2.c  | 12 +++++-------
 src/spells3.c  |  5 +++--
 src/types.h    |  6 +++---
 src/variable.c |  2 +-
 src/wizard1.c  | 21 ++++++---------------
 src/wizard2.c  |  5 +----
 src/xtra2.c    |  5 +++--
 17 files changed, 60 insertions(+), 75 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index a134ffc5d..0627f6cae 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1715,9 +1715,9 @@ static void today_target(void)
 	c_put_str(TERM_YELLOW, _("本日の賞金首", "Wanted monster that changes from day to day"), 5, 10);
 	sprintf(buf,_("ターゲット： %s", "target: %s"),r_name + r_ptr->name);
 	c_put_str(TERM_YELLOW, buf, 6, 10);
-	sprintf(buf,_("死体 ---- $%d", "corpse   ---- $%d"),r_ptr->level * 50 + 100);
+	sprintf(buf,_("死体 ---- $%d", "corpse   ---- $%d"), (int)r_ptr->level * 50 + 100);
 	prt(buf, 8, 10);
-	sprintf(buf,_("骨   ---- $%d", "skeleton ---- $%d"),r_ptr->level * 30 + 60);
+	sprintf(buf,_("骨   ---- $%d", "skeleton ---- $%d"), (int)r_ptr->level * 30 + 60);
 	prt(buf, 9, 10);
 	p_ptr->today_mon = today_mon;
 }
@@ -3579,7 +3579,7 @@ static void building_recharge(void)
 	object_kind *k_ptr;
 	cptr        q, s;
 	int         price;
-	int         charges;
+	PARAMETER_VALUE charges;
 	int         max_charges;
 	char        tmp_str[MAX_NLEN];
 
diff --git a/src/cave.c b/src/cave.c
index d22c077c3..8930af813 100644
--- a/src/cave.c
+++ b/src/cave.c
@@ -1745,7 +1745,7 @@ void prt_path(int y, int x)
 	int i;
 	int path_n;
 	u16b path_g[512];
-	int default_color = TERM_SLATE;
+	byte_hack default_color = TERM_SLATE;
 
 	if (!display_path) return;
 	if (-1 == project_length)
@@ -2018,7 +2018,7 @@ void display_map(int *cy, int *cx)
 			map_info(j, i, &ta, &tc, &ta, &tc);
 
 			/* Extract the priority */
-			tp = feat_priority;
+			tp = (byte_hack)feat_priority;
 
 			if(match_autopick!=-1
 			   && (match_autopick_yx[y][x] == -1
@@ -2902,7 +2902,7 @@ static void mon_lite_hack(POSITION y, POSITION x)
 /*
  * Add a square to the changes array
  */
-static void mon_dark_hack(int y, int x)
+static void mon_dark_hack(POSITION y, POSITION x)
 {
 	cave_type *c_ptr;
 	int       midpoint, dpf, d;
@@ -2990,7 +2990,7 @@ void update_mon_lite(void)
 	cave_type *c_ptr;
 
 	POSITION fx, fy;
-	void (*add_mon_lite)(int, int);
+	void (*add_mon_lite)(POSITION, POSITION);
 	int f_flag;
 
 	s16b end_temp;
@@ -4170,8 +4170,8 @@ void update_flow(void)
 		for (d = 0; d < 8; d++)
 		{
 			int old_head = flow_head;
-			int m = cave[ty][tx].cost + 1;
-			int n = cave[ty][tx].dist + 1;
+			byte_hack m = cave[ty][tx].cost + 1;
+			byte_hack n = cave[ty][tx].dist + 1;
 			cave_type *c_ptr;
 
 			/* Child location */
@@ -4663,7 +4663,7 @@ void cave_set_feat(POSITION y, POSITION x, IDX feat)
 }
 
 
-int conv_dungeon_feat(int newfeat)
+IDX conv_dungeon_feat(IDX newfeat)
 {
 	feature_type *f_ptr = &f_info[newfeat];
 
@@ -4697,7 +4697,7 @@ int conv_dungeon_feat(int newfeat)
  * Take a feature, determine what that feature becomes
  * through applying the given action.
  */
-int feat_state(int feat, int action)
+IDX feat_state(IDX feat, int action)
 {
 	feature_type *f_ptr = &f_info[feat];
 	int i;
@@ -4720,10 +4720,10 @@ int feat_state(int feat, int action)
 void cave_alter_feat(int y, int x, int action)
 {
 	/* Set old feature */
-	int oldfeat = cave[y][x].feat;
+	IDX oldfeat = cave[y][x].feat;
 
 	/* Get the new feat */
-	int newfeat = feat_state(oldfeat, action);
+	IDX newfeat = feat_state(oldfeat, action);
 
 	/* No change */
 	if (newfeat == oldfeat) return;
@@ -4969,7 +4969,7 @@ void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, int
 /*
  * Track a new monster
  */
-void health_track(int m_idx)
+void health_track(IDX m_idx)
 {
 	/* Mount monster is already tracked */
 	if (m_idx && m_idx == p_ptr->riding) return;
@@ -4986,7 +4986,7 @@ void health_track(int m_idx)
 /*
  * Hack -- track the given monster race
  */
-void monster_race_track(int r_idx)
+void monster_race_track(IDX r_idx)
 {
 	/* Save this monster ID */
 	p_ptr->monster_race_idx = r_idx;
@@ -5000,7 +5000,7 @@ void monster_race_track(int r_idx)
 /*
  * Hack -- track the given object kind
  */
-void object_kind_track(int k_idx)
+void object_kind_track(IDX k_idx)
 {
 	/* Save this monster ID */
 	p_ptr->object_kind_idx = k_idx;
diff --git a/src/cmd4.c b/src/cmd4.c
index 6ee783250..f41b7839e 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5717,7 +5717,7 @@ static void do_cmd_knowledge_uniques(void)
 		monster_race *r_ptr = &r_info[who[k]];
 
 		/* Print a message */
-		fprintf(fff, _("     %s (レベル%d)\n", "     %s (level %d)\n"), r_name + r_ptr->name, r_ptr->level);
+		fprintf(fff, _("     %s (レベル%d)\n", "     %s (level %d)\n"), r_name + r_ptr->name, (DEPTH)r_ptr->level);
 	}
 
 	/* Free the "who" array */
diff --git a/src/cmd5.c b/src/cmd5.c
index ea9ca3325..397a24066 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -612,7 +612,7 @@ void do_cmd_browse(void)
  * @param next_realm 変更先の魔法領域ID
  * @return なし
  */
-static void change_realm2(int next_realm)
+static void change_realm2(CHARACTER_IDX next_realm)
 {
 	int i, j = 0;
 	char tmp[80];
diff --git a/src/externs.h b/src/externs.h
index 24c991b90..414edbd3e 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -614,7 +614,7 @@ extern s16b feat_swamp;
 extern s16b feat_undetected;
 
 extern byte dungeon_type;
-extern s16b *max_dlv;
+extern DEPTH *max_dlv;
 extern s16b feat_wall_outer;
 extern s16b feat_wall_inner;
 extern s16b feat_wall_solid;
@@ -679,8 +679,8 @@ extern void map_area(int range);
 extern void wiz_lite(bool ninja);
 extern void wiz_dark(void);
 extern void cave_set_feat(POSITION y, POSITION x, IDX feat);
-extern int conv_dungeon_feat(int newfeat);
-extern int feat_state(int feat, int action);
+extern IDX conv_dungeon_feat(IDX newfeat);
+extern IDX feat_state(IDX feat, int action);
 extern void cave_alter_feat(int y, int x, int action);
 extern void remove_mirror(int y, int x);
 extern bool is_mirror_grid(cave_type *c_ptr);
@@ -689,9 +689,9 @@ extern bool is_explosive_rune_grid(cave_type *c_ptr);
 extern void mmove2(int *y, int *x, int y1, int x1, int y2, int x2);
 extern bool projectable(int y1, int x1, int y2, int x2);
 extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, int mode);
-extern void health_track(int m_idx);
-extern void monster_race_track(int r_idx);
-extern void object_kind_track(int k_idx);
+extern void health_track(IDX m_idx);
+extern void monster_race_track(IDX r_idx);
+extern void object_kind_track(IDX k_idx);
 extern void disturb(int stop_search, int flush_output);
 extern void glow_deep_lava_and_bldg(void);
 
@@ -991,9 +991,9 @@ extern bool summon_specific(int who, int y1, int x1, int lev, int type, u32b mod
 extern bool summon_named_creature (int who, int oy, int ox, int r_idx, u32b mode);
 extern bool multiply_monster(int m_idx, bool clone, u32b mode);
 extern void update_smart_learn(int m_idx, int what);
-extern void choose_new_monster(int m_idx, bool born, int r_idx);
+extern void choose_new_monster(IDX m_idx, bool born, IDX r_idx);
 extern byte get_mspeed(monster_race *r_ptr);
-extern bool player_place(int y, int x);
+extern bool player_place(POSITION y, POSITION x);
 extern void monster_drop_carried_objects(monster_type *m_ptr);
 
 /* object1.c */
@@ -1508,7 +1508,7 @@ extern bool get_hack_dir(int *dp);
 extern bool get_rep_dir(int *dp, bool under);
 extern bool get_rep_dir2(int *dp);
 extern void gain_level_reward(int chosen_reward);
-extern bool tgt_pt(int *x, int *y);
+extern bool tgt_pt(POSITION *x, POSITION *y);
 extern void do_poly_wounds(void);
 extern void change_race(int new_race, cptr effect_msg);
 extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear);
diff --git a/src/files.c b/src/files.c
index 1a2a25a57..4ed43002e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -4501,11 +4501,8 @@ static void dump_aux_recall(FILE *fff)
 		}
 		else if (max_dlv[y] == d_info[y].maxdepth) seiha = TRUE;
 
-#ifdef JP
-		fprintf(fff, "   %c%-12s: %3d 階\n", seiha ? '!' : ' ', d_name+d_info[y].name, max_dlv[y]);
-#else
-		fprintf(fff, "   %c%-16s: level %3d\n", seiha ? '!' : ' ', d_name+d_info[y].name, max_dlv[y]);
-#endif
+		fprintf(fff, _("   %c%-12s: %3d 階\n", "   %c%-16s: level %3d\n"),
+			seiha ? '!' : ' ', d_name+d_info[y].name, (int)max_dlv[y]);
 	}
 }
 
diff --git a/src/grid.c b/src/grid.c
index 91fe03036..473633e83 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -629,12 +629,11 @@ void set_floor(int x, int y)
  *   inner -- inner room walls\n
  *   outer -- outer room walls\n
  *   solid -- solid room walls\n
- * TODO: tmp_row/tmp_col をposition型に後から直す。
  */
 bool build_tunnel(POSITION row1, POSITION col1, POSITION row2, POSITION col2)
 {
 	int y, x;
-	int tmp_row, tmp_col;
+	POSITION tmp_row, tmp_col;
 	int row_dir, col_dir;
 	int start_row, start_col;
 	int main_loop_count = 0;
diff --git a/src/monster2.c b/src/monster2.c
index c8e0ef5d8..daec81a1b 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -2833,7 +2833,7 @@ static bool monster_hook_chameleon(int r_idx)
  * @param r_idx 旧モンスター種族のID
  * @return なし
  */
-void choose_new_monster(int m_idx, bool born, int r_idx)
+void choose_new_monster(IDX m_idx, bool born, IDX r_idx)
 {
 	int oldmaxhp;
 	monster_type *m_ptr = &m_list[m_idx];
@@ -4608,7 +4608,7 @@ void update_smart_learn(int m_idx, int what)
  * @param y 配置先Y座標
  * @return 配置に成功したらTRUE
  */
-bool player_place(int y, int x)
+bool player_place(POSITION y, POSITION x)
 {
 	/* Paranoia XXX XXX */
 	if (cave[y][x].m_idx != 0) return FALSE;
diff --git a/src/object2.c b/src/object2.c
index d1653d94d..7d80d82ad 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -345,7 +345,8 @@ static void compact_objects_aux(IDX i1, IDX i2)
  */
 void compact_objects(int size)
 {
-	int i, y, x, num, cnt;
+	IDX i;
+	int y, x, num, cnt;
 	int cur_lev, cur_dis, chance;
 	object_type *o_ptr;
 
@@ -2100,7 +2101,7 @@ static void object_mention(object_type *o_ptr)
  */
 static bool make_artifact_special(object_type *o_ptr)
 {
-	int i;
+	IDX i;
 	IDX k_idx = 0;
 
 	/*! @note 地上ではキャンセルする / No artifacts in the town */
@@ -2169,7 +2170,7 @@ static bool make_artifact_special(object_type *o_ptr)
  */
 static bool make_artifact(object_type *o_ptr)
 {
-	int i;
+	IDX i;
 
 
 	/* No artifacts in the town */
@@ -4113,7 +4114,7 @@ static void a_m_aux_4(object_type *o_ptr, int level, int power)
 
 		case TV_CORPSE:
 		{
-			int i = 1;
+			PARAMETER_VALUE i = 1;
 			int check;
 
 			u32b match = 0;
diff --git a/src/racial.c b/src/racial.c
index 5ee756b8f..b9e6da973 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -752,7 +752,7 @@ static int racial_aux(power_desc_type *pd_ptr)
  * @brief レイシャル・パワー発動時に口を使う継続的な詠唱処理を中断する
  * @return なし
  */
-void ratial_stop_mouth()
+void ratial_stop_mouth(void)
 {
 	if (music_singing_any()) stop_singing();
 	if (hex_spelling_any()) stop_hex_spell_all();
diff --git a/src/spells2.c b/src/spells2.c
index 894087c6d..4939345fb 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3233,11 +3233,9 @@ bool probing(void)
 #endif
 
 			/* Describe the monster */
-#ifdef JP
-sprintf(buf,"%s ... 属性:%s HP:%d/%d AC:%d 速度:%s%d 経験:", m_name, align, m_ptr->hp, m_ptr->maxhp, r_ptr->ac, (speed > 0) ? "+" : "", speed);
-#else
-sprintf(buf, "%s ... align:%s HP:%d/%d AC:%d speed:%s%d exp:", m_name, align, m_ptr->hp, m_ptr->maxhp, r_ptr->ac, (speed > 0) ? "+" : "", speed);
-#endif
+			sprintf(buf,_("%s ... 属性:%s HP:%d/%d AC:%d 速度:%s%d 経験:", "%s ... align:%s HP:%d/%d AC:%d speed:%s%d exp:"),
+				m_name, align, (int)m_ptr->hp, (int)m_ptr->maxhp, r_ptr->ac, (speed > 0) ? "+" : "", speed);
+
 			if (r_ptr->next_r_idx)
 			{
 				strcat(buf, format("%d/%d ", m_ptr->exp, r_ptr->next_exp));
@@ -3929,7 +3927,7 @@ bool earthquake_aux(int cy, int cx, int r, int m_idx)
 					/* Hack -- Escape from the rock */
 					if (sn)
 					{
-						int m_idx_aux = cave[yy][xx].m_idx;
+						IDX m_idx_aux = cave[yy][xx].m_idx;
 
 						/* Update the old location */
 						cave[yy][xx].m_idx = 0;
@@ -5637,7 +5635,7 @@ int summon_cyber(int who, int y, int x)
 void wall_breaker(void)
 {
 	int i;
-	int y = 0, x = 0;
+	POSITION y = 0, x = 0;
 	int attempts = 1000;
 
 	if (randint1(80 + p_ptr->lev) < 70)
diff --git a/src/spells3.c b/src/spells3.c
index 98add3f6c..d63feec87 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -998,7 +998,7 @@ bool reset_recall(void)
 	sprintf(ppp, _("何階にセットしますか (%d-%d):", "Reset to which level (%d-%d): "), d_info[select_dungeon].mindepth, max_dlv[select_dungeon]);
 
 	/* Default */
-	sprintf(tmp_val, "%d", MAX(dun_level, 1));
+	sprintf(tmp_val, "%d", (int)MAX(dun_level, 1));
 
 	/* Ask for a level */
 	if (get_string(ppp, tmp_val, 10))
@@ -1677,7 +1677,8 @@ void call_the_(void)
  */
 void fetch(int dir, int wgt, bool require_los)
 {
-	int             ty, tx, i;
+	int             ty, tx;
+	DEPTH i;
 	cave_type       *c_ptr;
 	object_type     *o_ptr;
 	char            o_name[MAX_NLEN];
diff --git a/src/types.h b/src/types.h
index 4ce6c7d4d..bb0af21fa 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1162,11 +1162,11 @@ struct player_type
 	bool teleport_town;
 	bool enter_dungeon;     /* Just enter the dungeon */
 
-	s16b health_who;	/* Health bar trackee */
+	IDX health_who;	/* Health bar trackee */
 
-	s16b monster_race_idx;	/* Monster race trackee */
+	IDX monster_race_idx;	/* Monster race trackee */
 
-	s16b object_kind_idx;	/* Object kind trackee */
+	IDX object_kind_idx;	/* Object kind trackee */
 
 	s16b new_spells;	/* Number of spells available */
 	s16b old_spells;
diff --git a/src/variable.c b/src/variable.c
index 9c40f1fb8..39dcd6b2e 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1254,7 +1254,7 @@ s16b feat_undetected;
  * Which dungeon ?
  */
 byte dungeon_type;
-s16b *max_dlv;
+DEPTH *max_dlv;
 
 s16b feat_wall_outer;
 s16b feat_wall_inner;
diff --git a/src/wizard1.c b/src/wizard1.c
index 7c6549c62..e6de35778 100644
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -1853,10 +1853,10 @@ static void spoil_mon_desc(cptr fname)
 
 
 		/* Level */
-		sprintf(lev, "%d", r_ptr->level);
+		sprintf(lev, "%d", (int)r_ptr->level);
 
 		/* Rarity */
-		sprintf(rar, "%d", r_ptr->rarity);
+		sprintf(rar, "%d", (int)r_ptr->rarity);
 
 		/* Speed */
 		if (r_ptr->speed >= 110)
@@ -2491,25 +2491,16 @@ static void spoil_mon_evol(cptr fname)
 
 		/* Trace the evolution tree */
 		r_ptr = &r_info[r_idx];
-#ifdef JP
-		fprintf(fff, "[%d]: %s (レベル%d, '%c')\n", r_idx,
-			r_name + r_ptr->name, r_ptr->level, r_ptr->d_char);
-#else
-		fprintf(fff, "[%d]: %s (Level %d, '%c')\n", r_idx,
-			r_name + r_ptr->name, r_ptr->level, r_ptr->d_char);
-#endif
+		fprintf(fff, _("[%d]: %s (レベル%d, '%c')\n", "[%d]: %s (Level %d, '%c')\n"),
+			r_idx, r_name + r_ptr->name, (int)r_ptr->level, r_ptr->d_char);
+
 		for (n = 1; r_ptr->next_exp; n++)
 		{
 			fprintf(fff, "%*s-(%ld)-> ", n * 2, "", (long int)r_ptr->next_exp);
 			fprintf(fff, "[%d]: ", r_ptr->next_r_idx);
 			r_ptr = &r_info[r_ptr->next_r_idx];
-#ifdef JP
-			fprintf(fff, "%s (レベル%d, '%c')\n",
-				r_name + r_ptr->name, r_ptr->level, r_ptr->d_char);
-#else
-			fprintf(fff, "%s (Level %d, '%c')\n",
+			fprintf(fff, _("%s (レベル%d, '%c')\n", "%s (Level %d, '%c')\n"),
 				r_name + r_ptr->name, r_ptr->level, r_ptr->d_char);
-#endif
 		}
 
 		/* End of evolution tree */
diff --git a/src/wizard2.c b/src/wizard2.c
index b150d5b8a..e28d87fcc 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -100,12 +100,9 @@ void do_cmd_rerate(bool display)
  */
 static bool wiz_dimension_door(void)
 {
-	int	x = 0, y = 0;
-
+	POSITION x = 0, y = 0;
 	if (!tgt_pt(&x, &y)) return FALSE;
-
 	teleport_player_to(y, x, TELEPORT_NONMAGICAL);
-
 	return (TRUE);
 }
 
diff --git a/src/xtra2.c b/src/xtra2.c
index 63ef804f0..10c9341fa 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -5218,10 +5218,11 @@ static void tgt_pt_prepare(void)
 /*
  * old -- from PsiAngband.
  */
-bool tgt_pt(int *x_ptr, int *y_ptr)
+bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
 {
 	char ch = 0;
-	int d, x, y, n = 0;
+	int d, n = 0;
+	POSITION x, y;
 	bool success = FALSE;
 
 	int wid, hgt;
-- 
2.11.0