From: Deskull <deskull@users.sourceforge.jp>
Date: Sun, 4 Nov 2018 14:47:48 +0000 (+0900)
Subject: [Refactor] #37287 #37353 型の置換。 / Type replacement.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b1418a5e4d0c06de1f654136a00c6bdf9005e4db;p=hengband%2Fhengband.git

[Refactor] #37287 #37353 型の置換。 / Type replacement.
---

diff --git a/src/externs.h b/src/externs.h
index 68d48fe1a..b762c263b 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -871,7 +871,7 @@ extern void remove_loc(void);
 extern bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
 
 /* spells1.c */
-extern int beam_chance(void);
+extern PERCENTAGE beam_chance(void);
 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, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ);
 extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell);
diff --git a/src/files.c b/src/files.c
index e6797176a..03e576c72 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1929,7 +1929,7 @@ static byte likert_color = TERM_WHITE;
  * @brief 技能ランクの表示基準を定める
  * Returns a "rating" of x depending on y
  * @param x 技能値
- * @param y  技能値に対するランク基準比
+ * @param y 技能値に対するランク基準比
  * @return なし
  */
 static cptr likert(int x, int y)
@@ -2798,7 +2798,7 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE])
  * @param mode オプション
  * @return なし
  */
-static void display_player_equippy(int y, int x, u16b mode)
+static void display_player_equippy(TERM_POSITION y, TERM_POSITION x, u16b mode)
 {
 	int i, max_i;
 
@@ -4069,10 +4069,10 @@ void display_player(BIT_FLAGS mode)
  */
 static void dump_aux_display_player(FILE *fff)
 {
-	int x, y;
+	TERM_POSITION x, y;
 	byte a;
 	char c;
-	char		buf[1024];
+	char buf[1024];
 
 	/* Display player */
 	display_player(0);
@@ -4924,7 +4924,7 @@ static void dump_aux_home_museum(FILE *fff)
 	if (st_ptr->stock_num)
 	{
 		int i;
-		int x = 1;
+		TERM_POSITION x = 1;
 
 		fprintf(fff, _("  [我が家のアイテム]\n", "  [Home Inventory]\n"));
 
@@ -4949,7 +4949,7 @@ static void dump_aux_home_museum(FILE *fff)
 	if (st_ptr->stock_num)
 	{
 		int i;
-		int x = 1;
+		TERM_POSITION x = 1;
 
 		fprintf(fff, _("  [博物館のアイテム]\n", "  [Museum]\n"));
 
diff --git a/src/spells1.c b/src/spells1.c
index e8d6f547d..0cce53c8a 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -87,14 +87,14 @@ static bool_hack common_saving_throw_control(player_type *player_ptr, HIT_POINT
 * ハードコーティングによる実装が行われている。
 * メイジは(レベル)%、ハイメイジ、スペルマスターは(レベル)%、それ以外の職業は(レベル/2)%
 */
-int beam_chance(void)
+PERCENTAGE beam_chance(void)
 {
 	if (p_ptr->pclass == CLASS_MAGE)
-		return p_ptr->lev;
+		return (PERCENTAGE)(p_ptr->lev);
 	if (p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER)
-		return p_ptr->lev + 10;
+		return (PERCENTAGE)(p_ptr->lev + 10);
 
-	return p_ptr->lev / 2;
+	return (PERCENTAGE)(p_ptr->lev / 2);
 }