From: Deskull <desull@users.sourceforge.jp>
Date: Fri, 13 Oct 2017 12:41:53 +0000 (+0900)
Subject: #37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=459fb2be8e178e7acb910cb282c00e609436dedf

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

diff --git a/src/externs.h b/src/externs.h
index cd7b9776b..35f257686 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1091,7 +1091,7 @@ extern bool save_floor(saved_floor_type *sf_ptr, u32b mode);
 
 /* spells1.c */
 extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ);
+extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ);
 extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell);
 extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ);
 extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg);
diff --git a/src/monster2.c b/src/monster2.c
index 36b038c57..4b174d7e8 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -3436,7 +3436,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
  * @return 成功したらtrue
  *  
  */
-static bool mon_scatter(MONRACE_IDX r_idx, int *yp, int *xp, int y, int x, int max_dist)
+static bool mon_scatter(MONRACE_IDX r_idx, POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION max_dist)
 {
 	int place_x[MON_SCAT_MAXD];
 	int place_y[MON_SCAT_MAXD];
diff --git a/src/object1.c b/src/object1.c
index 4d38b1d13..2e52f974e 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -2726,7 +2726,8 @@ bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
 
 	int j;
 	COMMAND_CODE k;
-	int i1, i2, e1, e2;
+	COMMAND_CODE i1, i2;
+	COMMAND_CODE e1, e2;
 
 	bool done, item;
 
@@ -4031,7 +4032,7 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
 	/* Repeat until done */
 	while (!done)
 	{
-		int get_item_label = 0;
+		COMMAND_CODE get_item_label = 0;
 
 		/* Show choices */
 		int ni = 0;
diff --git a/src/object2.c b/src/object2.c
index 635f5709b..770a82388 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -8075,7 +8075,7 @@ static int choose_essence(void)
 static void add_essence(int mode)
 {
 	int item, max_num = 0;
-	int i;
+	COMMAND_CODE i;
 	bool flag,redraw;
 	char choice;
 	cptr            q, s;
diff --git a/src/rooms.c b/src/rooms.c
index 96450a75b..d847f35bb 100644
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -3084,8 +3084,8 @@ static bool build_type8(void)
 {
 	vault_type *v_ptr;
 	int dummy;
-	int xval, yval;
-	int x, y;
+	POSITION xval, yval;
+	POSITION x, y;
 	int transno;
 	int xoffset, yoffset;
 
@@ -3147,7 +3147,7 @@ static bool build_type8(void)
 	 * prevent generation of vaults with no-entrance.
 	 */
 	/* Find and reserve some space in the dungeon.  Get center of room. */
-	if (!find_space(&yval, &xval, abs(y) + 2, abs(x) + 2)) return FALSE;
+	if (!find_space(&yval, &xval, (POSITION)(abs(y) + 2), (POSITION)(abs(x) + 2))) return FALSE;
 
 #ifdef FORCE_V_IDX
 	v_ptr = &v_info[76 + randint1(3)];
diff --git a/src/spells1.c b/src/spells1.c
index 29e8c31f7..513805c16 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1585,7 +1585,7 @@ static bool project_o(int who, int r, int y, int x, int dam, int typ)
  * "flg" was added.
  * </pre>
  */
-static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int flg, bool see_s_msg)
+static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, bool see_s_msg)
 {
 	int tmp;
 
@@ -1643,7 +1643,7 @@ static bool project_m(int who, int r, int y, int x, HIT_POINT dam, int typ, int
 	char m_name[80];
 	char m_poss[10];
 
-	int photo = 0;
+	PARAMETER_VALUE photo = 0;
 
 	/* Assume no note */
 	cptr note = NULL;
@@ -6544,10 +6544,10 @@ bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2)
 /*
  * breath shape
  */
-void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ)
+void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ)
 {
-	int by = y1;
-	int bx = x1;
+	POSITION by = y1;
+	POSITION bx = x1;
 	int brad = 0;
 	int brev = rad * rad / dist;
 	int bdis = 0;
@@ -6777,13 +6777,13 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
 {
 	int i, t, dist;
 
-	int y1, x1;
-	int y2, x2;
-	int by, bx;
+	POSITION y1, x1;
+	POSITION y2, x2;
+	POSITION by, bx;
 
 	int dist_hack = 0;
 
-	int y_saver, x_saver; /* For reflecting monsters */
+	POSITION y_saver, x_saver; /* For reflecting monsters */
 
 	int msec = delay_factor * delay_factor * delay_factor;
 
diff --git a/src/spells2.c b/src/spells2.c
index e69dd23ba..735322ffb 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2319,7 +2319,8 @@ bool detect_monsters_invis(POSITION range)
  */
 bool detect_monsters_evil(POSITION range)
 {
-	int i, y, x;
+	MONSTER_IDX i;
+	POSITION y, x;
 	bool flag = FALSE;
 
 	if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
@@ -2388,8 +2389,9 @@ bool detect_monsters_evil(POSITION range)
  */
 bool detect_monsters_nonliving(POSITION range)
 {
-	int     i, y, x;
-	bool    flag = FALSE;
+	MONSTER_IDX i;
+	POSITION y, x;
+	bool flag = FALSE;
 
 	if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
diff --git a/src/spells3.c b/src/spells3.c
index d9ab543bf..05cb37b0c 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1789,7 +1789,7 @@ void alter_reality(void)
 
 	if (!p_ptr->alter_reality)
 	{
-		int turns = randint0(21) + 15;
+		TIME_EFFECT turns = randint0(21) + 15;
 
 		p_ptr->alter_reality = turns;
 		msg_print(_("回りの景色が変わり始めた...", "The view around you begins to change..."));
@@ -2908,7 +2908,8 @@ bool item_tester_hook_recharge(object_type *o_ptr)
 bool recharge(int power)
 {
 	int item, lev;
-	int recharge_strength, recharge_amount;
+	int recharge_strength;
+	TIME_EFFECT recharge_amount;
 
 	object_type *o_ptr;
 	object_kind *k_ptr;
diff --git a/src/store.c b/src/store.c
index aff4f4c1f..54007ab00 100644
--- a/src/store.c
+++ b/src/store.c
@@ -2610,7 +2610,7 @@ static void display_store(void)
  * @param j 選択範囲の最大値
  * @return 実際に選択したらTRUE、キャンセルしたらFALSE
  */
-static int get_stock(int *com_val, cptr pmt, int i, int j)
+static int get_stock(COMMAND_CODE *com_val, cptr pmt, int i, int j)
 {
 	char	command;
 	char	out_val[160];
diff --git a/src/util.c b/src/util.c
index b4dfea1db..f3f85d438 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3805,7 +3805,7 @@ bool get_com(cptr prompt, char *command, bool z_escape)
 s16b get_quantity(cptr prompt, int max)
 {
 	bool res;
-	int amt;
+	COMMAND_CODE amt;
 	char tmp[80];
 	char buf[80];