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

diff --git a/src/h-type.h b/src/h-type.h
index 966baa0..fdaec0f 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -198,6 +198,8 @@ typedef s16b FEED;       /*!< ゲーム中の滋養度の型定義 */
 
 typedef u32b STR_OFFSET;      /*!< テキストオフセットの型定義 */
 
 
 typedef u32b STR_OFFSET;      /*!< テキストオフセットの型定義 */
 

+typedef int POWER;             /*!< 魔法の効力定義*/
+

 typedef s32b DEPTH;     /*!< ゲーム中の階層レベルの型定義 */
 typedef byte RARITY;    /*!< ゲーム中の希少度の型定義 */
 
 typedef s32b DEPTH;     /*!< ゲーム中の階層レベルの型定義 */
 typedef byte RARITY;    /*!< ゲーム中の希少度の型定義 */
 

diff --git a/src/realm-nature.c b/src/realm-nature.c
index ca87ef8..bb09edc 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -546,8 +546,8 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {\r
                        int d_dam = 4 * plev;\r
                        int b_dam = (100 + plev) * 2;\r
                {\r
                        int d_dam = 4 * plev;\r
                        int b_dam = (100 + plev) * 2;\r

-                       int b_rad = 1 + plev / 12;\r
-                       int q_rad = 20 + plev / 2;\r
+                       POSITION b_rad = 1 + plev / 12;\r
+                       POSITION q_rad = 20 + plev / 2;\r

 \r
                        if (info) return format("%s%d+%d", s_dam, d_dam, b_dam / 2);\r
 \r
 \r
                        if (info) return format("%s%d+%d", s_dam, d_dam, b_dam / 2);\r
 \r

diff --git a/src/realm-song.c b/src/realm-song.c
index c29d97a..6091316 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -98,7 +98,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                }
 
                {
                }
 
                {

-                       int power = plev;
+                       POWER power = plev;

 
                        if (info) return info_power(power);
 
 
                        if (info) return info_power(power);
 


@@ -244,7 +244,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                }
 
                {
                }
 
                {

-                       int power = plev;
+                       POWER power = plev;

 
                        if (info) return info_power(power);
 
 
                        if (info) return info_power(power);
 


@@ -443,7 +443,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                }
 
                {
                }
 
                {

-                       int power = plev * 2;
+                       POWER power = plev * 2;

 
                        if (info) return info_power(power);
 
 
                        if (info) return info_power(power);
 


@@ -624,7 +624,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                {
                        POSITION rad = plev / 15 + 1;
 
                {
                        POSITION rad = plev / 15 + 1;

-                       int power = plev * 3 + 1;
+                       POWER power = plev * 3 + 1;

 
                        if (info) return info_radius(rad);
 
 
                        if (info) return info_radius(rad);
 


@@ -654,8 +654,8 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                }
 
                {
                }
 
                {

-                       int m_sides = plev * 3;
-                       int e_sides = plev * 3;
+                       DICE_SID m_sides = plev * 3;
+                       DICE_SID e_sides = plev * 3;

 
                        if (info) return format("%s1d%d+1d%d", s_dam, m_sides, e_sides);
 
 
                        if (info) return format("%s1d%d+1d%d", s_dam, m_sides, e_sides);
 


@@ -681,7 +681,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                }
 
                {
                }
 
                {

-                       int power = plev;
+                       POWER power = plev;

 
                        if (info) return info_power(power);
 
 
                        if (info) return info_power(power);
 


@@ -779,7 +779,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                }
 
                {
                }
 
                {

-                       int power = plev * 4;
+                       POWER power = plev * 4;

 
                        if (info) return info_power(power);
 
 
                        if (info) return info_power(power);
 


@@ -941,7 +941,6 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        p_ptr->redraw |= (PR_MAP);
                        p_ptr->update |= (PU_MONSTERS);
 
                        p_ptr->redraw |= (PR_MAP);
                        p_ptr->update |= (PU_MONSTERS);

-

                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                        start_singing(spell, MUSIC_INVULN);
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                        start_singing(spell, MUSIC_INVULN);


@@ -955,7 +954,6 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                                p_ptr->redraw |= (PR_MAP);
                                p_ptr->update |= (PU_MONSTERS);
 
                                p_ptr->redraw |= (PR_MAP);
                                p_ptr->update |= (PU_MONSTERS);

-

                                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
                        }
                }
                                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
                        }
                }

diff --git a/src/rooms-special.c b/src/rooms-special.c
index eb669e9..8cfb12f 100644 (file)
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -176,7 +176,7 @@ bool build_type15(void)
 \r
        case 3: /* 4 shards breathers + 2 potions */\r
        {\r
 \r
        case 3: /* 4 shards breathers + 2 potions */\r
        {\r

-               int dir1;\r
+               DIRECTION dir1;\r

 \r
                /* Walls around the potion */\r
                for (y = yval - 2; y <= yval + 2; y++)\r
 \r
                /* Walls around the potion */\r
                for (y = yval - 2; y <= yval + 2; y++)\r