[Refactor] #37353 コメント整理。 / Refactor comments.

[hengband/hengband.git] / src / realm-nature.c

diff --git a/src/realm-nature.c b/src/realm-nature.c
index 6f51f35..e584805 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -45,7 +45,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 3 + (plev - 1) / 5;\r
-                       int sides = 4;\r
+                       DICE_SID sides = 4;\r
                        POSITION range = plev / 6 + 2;\r
 \r
                        if (info) return format("%s%dd%d %s%d", s_dam, dice, sides, s_rng, range);\r
@@ -104,7 +104,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 2;\r
-                       int sides = plev / 2;\r
+                       DICE_SID sides = plev / 2;\r
                        POSITION rad = (plev / 10) + 1;\r
 \r
                        if (info) return info_damage(dice, sides, 0);\r
@@ -165,7 +165,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 2;\r
-                       int sides = 8;\r
+                       DICE_SID sides = 8;\r
 \r
                        if (info) return info_heal(dice, sides, 0);\r
 \r
@@ -184,7 +184,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 1;\r
-                       int sides = 30;\r
+                       DICE_SID sides = 30;\r
                        int base = 20;\r
 \r
                        if (info) return info_damage(dice, sides, base);\r
@@ -204,7 +204,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 3 + (plev - 5) / 4;\r
-                       int sides = 8;\r
+                       DICE_SID sides = 8;\r
 \r
                        if (info) return info_damage(dice, sides, 0);\r
 \r
@@ -244,7 +244,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 5 + (plev - 5) / 4;\r
-                       int sides = 8;\r
+                       DICE_SID sides = 8;\r
 \r
                        if (info) return info_damage(dice, sides, 0);\r
 \r
@@ -262,7 +262,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        DICE_NUMBER dice = 6;\r
-                       int sides = 8;\r
+                       DICE_SID sides = 8;\r
 \r
                        if (info) return info_damage(dice, sides, 0);\r
 \r
@@ -292,7 +292,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {\r
                        if (cast)\r
                        {\r
-                               if (!(summon_specific(-1, p_ptr->y, p_ptr->x, plev, SUMMON_ANIMAL_RANGER, (PM_ALLOW_GROUP | PM_FORCE_PET))))\r
+                               if (!(summon_specific(-1, p_ptr->y, p_ptr->x, plev, SUMMON_ANIMAL_RANGER, (PM_ALLOW_GROUP | PM_FORCE_PET), '\0')))\r
                                {\r
                                        msg_print(_("動物は現れなかった。", "No animals arrive."));\r
                                }\r
@@ -329,7 +329,7 @@ cptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 \r
                {\r
                        int base = 20;\r
-                       int sides = 30;\r
+                       DICE_SID sides = 30;\r
 \r
                        if (info) return info_duration(base, sides);\r
 \r
@@ -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
-                       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