From: Hourier <hourier@users.sourceforge.jp>
Date: Tue, 21 Jul 2020 10:25:12 +0000 (+0900)
Subject: [Refactor] #40481 Separated cast_blue_make_trap() from cast_learned_spell()
X-Git-Tag: vmacos3.0.0-alpha52~782^2~33
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6a6ef35501493559960157421b70dbfd0ea9100d;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #40481 Separated cast_blue_make_trap() from cast_learned_spell()
---

diff --git a/src/blue-magic/blue-magic-caster.c b/src/blue-magic/blue-magic-caster.c
index b7061041e..d14a70bef 100644
--- a/src/blue-magic/blue-magic-caster.c
+++ b/src/blue-magic/blue-magic-caster.c
@@ -149,6 +149,16 @@ bool cast_blue_psi_spear(player_type *caster_ptr, bmc_type *bmc_ptr)
     return TRUE;
 }
 
+bool cast_blue_make_trap(player_type *caster_ptr)
+{
+    if (!target_set(caster_ptr, TARGET_KILL))
+        return FALSE;
+
+    msg_print(_("呪文を唱えて邪悪に微笑んだ。", "You cast a spell and cackle evilly."));
+    trap_creation(caster_ptr, target_row, target_col);
+    return TRUE;
+}
+
 /*!
  * @brief 青魔法の発動 /
  * do_cmd_cast calls this function if the player's class is 'blue-mage'.
@@ -516,11 +526,9 @@ bool cast_learned_spell(player_type *caster_ptr, int spell, const bool success)
         (void)unlite_area(caster_ptr, 10, 3);
         break;
     case MS_MAKE_TRAP:
-        if (!target_set(caster_ptr, TARGET_KILL))
-            return FALSE;
+        if (!cast_blue_make_trap(caster_ptr))
+            return;
 
-        msg_print(_("呪文を唱えて邪悪に微笑んだ。", "You cast a spell and cackle evilly."));
-        trap_creation(caster_ptr, target_row, target_col);
         break;
     case MS_FORGET:
         msg_print(_("しかし何も起きなかった。", "Nothing happen."));