[Refactor] #39963 Separated effect_player_missile() and effect_player_holy+hell_fire...

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index 9add4f8..1d0e0fb 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -70,6 +70,35 @@ void effect_player_nuke(player_type *target_ptr, effect_player_type *ep_ptr)
 }
 
 
+void effect_player_missile(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+       if (target_ptr->blind) msg_print(_("\89½\82©\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something!"));
+       ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
+}
+
+
+void effect_player_holy_file(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+       if (target_ptr->blind) msg_print(_("\89½\82©\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something!"));
+       if (target_ptr->align > 10)
+               ep_ptr->dam /= 2;
+       else if (target_ptr->align < -10)
+               ep_ptr->dam *= 2;
+
+       ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
+}
+
+
+void effect_player_hell_fire(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+       if (target_ptr->blind) msg_print(_("\89½\82©\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something!"));
+       if (target_ptr->align > 10)
+               ep_ptr->dam *= 2;
+
+       ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
+}
+
+
 /*!
  * @brief \96\82\96@\82Ì\8cø\89Ê\82É\82æ\82Á\82Ä\97l\81X\82È\83\81\83b\83Z\81[\82ð\8fo\97Í\82µ\82½\82è\97^\82¦\82é\83_\83\81\81[\83W\82Ì\91\9d\8c¸\82ð\8ds\82Á\82½\82è\82·\82é
  * @param target_ptr \83v\83\8c\81[\83\84\81[\82Ö\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
@@ -99,29 +128,13 @@ void switch_effects_player(player_type *target_ptr, effect_player_type *ep_ptr)
                effect_player_nuke(target_ptr, ep_ptr);
                return;
        case GF_MISSILE:
-       {
-               if (target_ptr->blind) msg_print(_("\89½\82©\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something!"));
-               ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-               break;
-       }
+               effect_player_missile(target_ptr, ep_ptr);
+               return;
        case GF_HOLY_FIRE:
-       {
-               if (target_ptr->blind) msg_print(_("\89½\82©\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something!"));
-               if (target_ptr->align > 10)
-                       ep_ptr->dam /= 2;
-               else if (target_ptr->align < -10)
-                       ep_ptr->dam *= 2;
-               ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-               break;
-       }
+               effect_player_holy_file(target_ptr, ep_ptr);
+               return;
        case GF_HELL_FIRE:
-       {
-               if (target_ptr->blind) msg_print(_("\89½\82©\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something!"));
-               if (target_ptr->align > 10)
-                       ep_ptr->dam *= 2;
-               ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-               break;
-       }
+               effect_plyaer_hell_fire(target_ptr, ep_ptr);
        case GF_ARROW:
        {
                if (target_ptr->blind)

diff --git a/src/effect/effect-player-util.h b/src/effect/effect-player-util.h
index 33d6bf6..aa3fb88 100644 (file)
--- a/src/effect/effect-player-util.h
+++ b/src/effect/effect-player-util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-typedef struct
+typedef struct effect_player_type
 {
        DEPTH rlev; // モンスターのレベル (但し0のモンスターは1になる).
        monster_type *m_ptr;