[Refactor] #37353 魔法戦士の変換能力を convert_hp_to_mp()/convert_mp_to_hp() に分離。 / Separate...

diff --git a/src/externs.h b/src/externs.h
index b17d714..288a4b7 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -994,6 +994,8 @@ extern bool android_inside_weapon(player_type *creature_ptr);
 extern bool create_ration(player_type *crature_ptr);
 extern void hayagake(player_type *creature_ptr);
 extern bool double_attack(player_type *creature_ptr);
+extern bool comvert_hp_to_mp(player_type *creature_ptr);
+extern bool comvert_mp_to_hp(player_type *creature_ptr);
 
 /* spells3.c */
 extern bool teleport_away(MONSTER_IDX m_idx, POSITION dis, BIT_FLAGS mode);

diff --git a/src/racial.c b/src/racial.c
index f942773..1d4f3d9 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -486,37 +486,12 @@ static bool cmd_racial_power_aux(s32b command)
                {
                        if (command == -3)
                        {
-                               int gain_sp = take_hit(DAMAGE_USELIFE, p_ptr->lev, _("ＨＰからＭＰへの無謀な変換", "thoughtless convertion from HP to SP"), -1) / 5;
-                               if (gain_sp)
-                               {
-                                       p_ptr->csp += gain_sp;
-                                       if (p_ptr->csp > p_ptr->msp)
-                                       {
-                                               p_ptr->csp = p_ptr->msp;
-                                               p_ptr->csp_frac = 0;
-                                       }
-                               }
-                               else
-                               {
-                                       msg_print(_("変換に失敗した。", "You failed to convert."));
-                               }
+                               return comvert_hp_to_mp(p_ptr);
                        }
                        else if (command == -4)
                        {
-                               if (p_ptr->csp >= p_ptr->lev / 5)
-                               {
-                                       p_ptr->csp -= p_ptr->lev / 5;
-                                       hp_player(p_ptr->lev);
-                               }
-                               else
-                               {
-                                       msg_print(_("変換に失敗した。", "You failed to convert."));
-                               }
+                               return comvert_mp_to_hp(p_ptr);
                        }
-
-                       /* Redraw mana and hp */
-                       p_ptr->redraw |= (PR_HP | PR_MANA);
-
                        break;
                }
                case CLASS_CHAOS_WARRIOR:

diff --git a/src/spells2.c b/src/spells2.c
index d8dbc4c..9e2dd03 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5225,3 +5225,39 @@ bool double_attack(player_type *creature_ptr)
        }
        return TRUE;
 }
+
+bool comvert_hp_to_mp(player_type *creature_ptr)
+{
+       int gain_sp = take_hit(DAMAGE_USELIFE, creature_ptr->lev, _("ＨＰからＭＰへの無謀な変換", "thoughtless convertion from HP to SP"), -1) / 5;
+       if (gain_sp)
+       {
+               creature_ptr->csp += gain_sp;
+               if (creature_ptr->csp > creature_ptr->msp)
+               {
+                       creature_ptr->csp = creature_ptr->msp;
+                       creature_ptr->csp_frac = 0;
+               }
+       }
+       else
+       {
+               msg_print(_("変換に失敗した。", "You failed to convert."));
+       }
+       creature_ptr->redraw |= (PR_HP | PR_MANA);
+       return TRUE;
+}
+
+bool comvert_mp_to_hp(player_type *creature_ptr)
+{
+       if (creature_ptr->csp >= creature_ptr->lev / 5)
+       {
+               creature_ptr->csp -= creature_ptr->lev / 5;
+               hp_player(creature_ptr->lev);
+       }
+       else
+       {
+               msg_print(_("変換に失敗した。", "You failed to convert."));
+       }
+       /* Redraw mana and hp */
+       creature_ptr->redraw |= (PR_HP | PR_MANA);
+       return TRUE;
+}
\ No newline at end of file