OSDN Git Service

[Refactor] fire_ball() から fire_breath() へのリファクタリング漏れ修正。 / Refactor non-renamed fire_b...
authorDeskull <deskull@users.sourceforge.jp>
Mon, 10 Sep 2018 11:36:45 +0000 (20:36 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Mon, 10 Sep 2018 11:36:45 +0000 (20:36 +0900)
src/cmd-spell.c
src/cmd-zapwand.c
src/mspells3.c
src/racial.c

index 5bf7a97..6636410 100644 (file)
@@ -2069,8 +2069,7 @@ static cptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {\r
                                if (!get_aim_dir(&dir)) return NULL;\r
 \r
-                               fire_ball(GF_DISINTEGRATE, dir,\r
-                                       damroll(dice, sides), 0);\r
+                               fire_ball(GF_DISINTEGRATE, dir, damroll(dice, sides), 0);\r
                        }\r
                }\r
                break;\r
index fd6e8af..3eedc15 100644 (file)
@@ -254,7 +254,7 @@ int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool magic)
 
                if (powerful) dam = (dam * 3) / 2;
 
-               fire_ball(typ, dir, dam, -3);
+               fire_breath(typ, dir, dam, 3);
 
                ident = TRUE;
                break;
index 865b402..3a49814 100644 (file)
@@ -697,7 +697,7 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("冷気のブレスを吐いた。", "You breathe frost."));
         damage = monspell_bluemage_damage((MS_BR_COLD), plev, DAM_ROLL);
-               fire_ball(GF_COLD, dir, damage, (plev > 40 ? -3 : -2));
+               fire_breath(GF_COLD, dir, damage, (plev > 40 ? 3 : 2));
                break;
        case MS_BR_POIS:
         if (!get_aim_dir(&dir)) return FALSE;
index 113209e..0a68687 100644 (file)
@@ -1557,8 +1557,7 @@ static bool cmd_racial_power_aux(s32b command)
                                ratial_stop_mouth();
                                msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), Type_desc);
 
-                               fire_ball(Type, dir, plev * 2,
-                                   -(plev / 15) - 1);
+                               fire_breath(Type, dir, plev * 2, (plev / 15) + 1);
                        }
                        break;