From 37d1759fe0e93b8c0b893deb51dd1e0e1c5ebfb8 Mon Sep 17 00:00:00 2001 From: Hourier Date: Thu, 30 Jul 2020 19:29:29 +0900 Subject: [PATCH] [Refactor] #40573 Separated mind_turn_passing() from do_cmd_mind() --- src/cmd-action/cmd-mind.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/cmd-action/cmd-mind.c b/src/cmd-action/cmd-mind.c index 36cb61a0d..12073a196 100644 --- a/src/cmd-action/cmd-mind.c +++ b/src/cmd-action/cmd-mind.c @@ -281,6 +281,17 @@ static bool switch_mind_class(player_type *caster_ptr, cm_type *cm_ptr) } } +static void mind_turn_passing(player_type *caster_ptr, cm_type *cm_ptr) +{ + if (!cm_ptr->on_mirror || (caster_ptr->pclass != CLASS_MIRROR_MASTER)) { + take_turn(caster_ptr, 100); + return; + } + + if (cm_ptr->n == 3 || cm_ptr->n == 5 || cm_ptr->n == 7 || cm_ptr->n == 16) + take_turn(caster_ptr, 50); +} + /*! * @brief 特殊技能コマンドのメインルーチン / * @return なし @@ -317,12 +328,7 @@ void do_cmd_mind(player_type *caster_ptr) return; } - if (cm_ptr->on_mirror && caster_ptr->pclass == CLASS_MIRROR_MASTER) { - if (cm_ptr->n == 3 || cm_ptr->n == 5 || cm_ptr->n == 7 || cm_ptr->n == 16) - take_turn(caster_ptr, 50); - } else - take_turn(caster_ptr, 100); - + mind_turn_passing(caster_ptr, cm_ptr); if ((cm_ptr->use_mind == MIND_BERSERKER) || (cm_ptr->use_mind == MIND_NINJUTSU)) { take_hit(caster_ptr, DAMAGE_USELIFE, cm_ptr->mana_cost, _("過度の集中", "concentrating too hard"), -1); caster_ptr->redraw |= PR_HP; -- 2.11.0