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

diff --git a/src/cave.c b/src/cave.c
index 49c3c16..72529a7 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -437,9 +437,10 @@ static bool check_local_illumination(int y, int x)
  * @param x x座標
  * @return なし
  */
-void update_local_illumination(int y, int x)
+void update_local_illumination(POSITION y, POSITION x)
 {
-       int i, yy, xx;
+       int i;
+       POSITION yy, xx;
 
        if (!in_bounds(y, x)) return;
 

diff --git a/src/externs.h b/src/externs.h
index d0d5f8e..624bd1d 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -654,7 +654,7 @@ extern bool is_known_trap(cave_type *c_ptr);
 extern bool is_closed_door(IDX feat);
 extern bool is_hidden_door(cave_type *c_ptr);
 extern bool los(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-extern void update_local_illumination(int y, int x);
+extern void update_local_illumination(POSITION y, POSITION x);
 extern bool player_can_see_bold(int y, int x);
 extern bool cave_valid_bold(int y, int x);
 extern bool no_lite(void);

diff --git a/src/mspells1.c b/src/mspells1.c
index c1cc2c4..ffadad9 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -713,12 +713,7 @@ void curse_equipment(int chance, int heavy_chance)
 
        if (changed)
        {
-#ifdef JP
-msg_format("悪意に満ちた黒いオーラが%sをとりまいた...", o_name);
-#else
-               msg_format("There is a malignant black aura surrounding %s...", o_name);
-#endif
-
+               msg_format(_("悪意に満ちた黒いオーラが%sをとりまいた...", "There is a malignant black aura surrounding %s..."), o_name);
                o_ptr->feeling = FEEL_NONE;
        }
        p_ptr->update |= (PU_BONUS);
@@ -1447,11 +1442,11 @@ bool make_attack_spell(MONSTER_IDX m_idx)
        PERCENTAGE failrate;
        byte            spell[96], num = 0;
        BIT_FLAGS f4, f5, f6;
-       monster_type    *m_ptr = &m_list[m_idx];
-       monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-       char            m_name[80];
+       monster_type *m_ptr = &m_list[m_idx];
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+       char m_name[80];
 #ifndef JP
-       char            m_poss[80];
+       char m_poss[80];
 #endif
        bool            no_inate = FALSE;
        bool            do_spell = DO_SPELL_NONE;