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

diff --git a/src/artifact.c b/src/artifact.c
index c8cbb37..9003e2c 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2342,8 +2342,7 @@ int calc_arm_avgdamage(object_type *o_ptr)
 
        dam = dam + o_ptr->to_d;
 
 
        dam = dam + o_ptr->to_d;
 

-       msg_format_wizard(CHEAT_OBJECT,"素:%d> 対邪:%d> 理力:%d> 切:%d> 最終:%d",
-               base, s_evil, forced, vorpal, dam);
+       msg_format_wizard(CHEAT_OBJECT,"素:%d> 対邪:%d> 理力:%d> 切:%d> 最終:%d", base, s_evil, forced, vorpal, dam);

 
        return(dam);
 }
 
        return(dam);
 }

diff --git a/src/bldg.c b/src/bldg.c
index 22675d0..18f32b0 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -975,7 +975,7 @@ static int do_poker(void)
                cards[i] = deck[deck_ptr++];
                kaeruka[i] = 0; /* default:nokosu */
        }
                cards[i] = deck[deck_ptr++];
                kaeruka[i] = 0; /* default:nokosu */
        }

-       
+

        /* suteruno wo kimeru */
        prt(_("残すカードを決めて下さい(方向で移動, スペースで選択)。", "Stay witch? "), 0, 0);
 
        /* suteruno wo kimeru */
        prt(_("残すカードを決めて下さい(方向で移動, スペースで選択)。", "Stay witch? "), 0, 0);
 

diff --git a/src/spells2.c b/src/spells2.c
index 97a9847..f3d67e7 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -25,7 +25,7 @@
  */
 static bool detect_feat_flag(POSITION range, int flag, bool known)
 {
  */
 static bool detect_feat_flag(POSITION range, int flag, bool known)
 {

-       int x, y;
+       POSITION x, y;

        bool detect = FALSE;
        cave_type *c_ptr;
 
        bool detect = FALSE;
        cave_type *c_ptr;
 


@@ -155,7 +155,8 @@ bool detect_treasure(POSITION range)
  */
 bool detect_objects_gold(POSITION range)
 {
  */
 bool detect_objects_gold(POSITION range)
 {

-       int i, y, x;
+       OBJECT_IDX i;
+       POSITION y, x;

        POSITION range2 = range;
 
        bool detect = FALSE;
        POSITION range2 = range;
 
        bool detect = FALSE;


@@ -209,7 +210,8 @@ bool detect_objects_gold(POSITION range)
  */
 bool detect_objects_normal(POSITION range)
 {
  */
 bool detect_objects_normal(POSITION range)
 {

-       int i, y, x;
+       OBJECT_IDX i;
+       POSITION y, x;

        POSITION range2 = range;
 
        bool detect = FALSE;
        POSITION range2 = range;
 
        bool detect = FALSE;


@@ -271,7 +273,9 @@ bool detect_objects_normal(POSITION range)
  */
 bool detect_objects_magic(POSITION range)
 {
  */
 bool detect_objects_magic(POSITION range)
 {

-       int i, y, x, tv;
+       OBJECT_TYPE_VALUE tv;
+       OBJECT_IDX i;
+       POSITION y, x;

 
        bool detect = FALSE;
 
 
        bool detect = FALSE;
 


@@ -570,7 +574,7 @@ bool detect_monsters_mind(POSITION range)
 {
        MONSTER_IDX i;
        POSITION y, x;
 {
        MONSTER_IDX i;
        POSITION y, x;

-       bool    flag = FALSE;
+       bool flag = FALSE;

 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;
 
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS) range /= 3;