From 10d8989c613f223ec43f3d77ddf2aa864ff3250b Mon Sep 17 00:00:00 2001 From: Hourier Date: Mon, 4 May 2020 21:25:31 +0900 Subject: [PATCH] [Refactor] #39963 Separated effect-player-oldies.c/h from effect-player-switcher.c --- Hengband_vcs2017/Hengband/Hengband.vcxproj | 2 + Hengband_vcs2017/Hengband/Hengband.vcxproj.filters | 6 +++ src/Makefile.am | 1 + src/effect/effect-player-oldies.c | 51 ++++++++++++++++++++++ src/effect/effect-player-oldies.h | 6 +++ src/effect/effect-player-switcher.c | 50 +-------------------- 6 files changed, 68 insertions(+), 48 deletions(-) create mode 100644 src/effect/effect-player-oldies.c create mode 100644 src/effect/effect-player-oldies.h diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index 716ff6431..ff76f83a8 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -190,6 +190,7 @@ + @@ -372,6 +373,7 @@ + diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index 8be4fa3d7..68535e5fc 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -748,6 +748,9 @@ effect + + effect + @@ -1508,6 +1511,9 @@ effect + + effect + diff --git a/src/Makefile.am b/src/Makefile.am index 78e81e547..7180fc326 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -182,6 +182,7 @@ hengband_SOURCES = \ effect/effect-monster-switcher.c effect/effect-monster-switcher.h \ effect/effect-player-util.h \ effect/effect-player-resist-hurt.c effect/effect-player-resist-hurt.h \ + effect/effect-player-oldies.c effect/effect-player-oldies.h \ effect/effect-player-switcher.c effect/effect-player-switcher.h \ \ spell/technic-info-table.c spell/technic-info-table.h \ diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c new file mode 100644 index 000000000..4553b4b8b --- /dev/null +++ b/src/effect/effect-player-oldies.c @@ -0,0 +1,51 @@ +#include "angband.h" +#include "effect/effect-player-util.h" +#include "effect/effect-player-oldies.h" +#include "player-effects.h" + +void effect_player_old_heal(player_type *target_ptr, + effect_player_type *ep_ptr) { + if (target_ptr->blind) + msg_print(_("何らかの攻撃によって気分がよくなった。", + "You are hit by something invigorating!")); + + (void)hp_player(target_ptr, ep_ptr->dam); + ep_ptr->dam = 0; +} + +void effect_player_old_speed(player_type *target_ptr, + effect_player_type *ep_ptr) { + if (target_ptr->blind) + msg_print(_("何かで攻撃された！", "You are hit by something!")); + + (void)set_fast(target_ptr, target_ptr->fast + randint1(5), FALSE); + ep_ptr->dam = 0; +} + +void effect_player_old_slow(player_type *target_ptr) { + if (target_ptr->blind) + msg_print( + _("何か遅いもので攻撃された！", "You are hit by something slow!")); + + (void)set_slow(target_ptr, target_ptr->slow + randint0(4) + 4, FALSE); +} + +void effect_player_old_sleep(player_type *target_ptr, + effect_player_type *ep_ptr) { + if (target_ptr->free_act) + return; + + if (target_ptr->blind) + msg_print(_("眠ってしまった！", "You fall asleep!")); + + if (ironman_nightmare) { + msg_print(_("恐ろしい光景が頭に浮かんできた。", + "A horrible vision enters your mind.")); + + /* Have some nightmares */ + sanity_blast(target_ptr, NULL, FALSE); + } + + set_paralyzed(target_ptr, target_ptr->paralyzed + ep_ptr->dam); + ep_ptr->dam = 0; +} diff --git a/src/effect/effect-player-oldies.h b/src/effect/effect-player-oldies.h new file mode 100644 index 000000000..394d140e2 --- /dev/null +++ b/src/effect/effect-player-oldies.h @@ -0,0 +1,6 @@ +#pragma once + +void effect_player_old_heal(player_type *target_ptr, effect_player_type *ep_ptr); +void effect_player_old_speed(player_type *target_ptr, effect_player_type *ep_ptr); +void effect_player_old_slow(player_type *target_ptr); +void effect_player_old_sleep(player_type *target_ptr, effect_player_type *ep_ptr); diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c index dd861a3a2..d31f60b72 100644 --- a/src/effect/effect-player-switcher.c +++ b/src/effect/effect-player-switcher.c @@ -10,53 +10,7 @@ #include "monster-spell.h" #include "object-curse.h" #include "effect/effect-player-resist-hurt.h" - -void effect_player_old_heal(player_type *target_ptr, - effect_player_type *ep_ptr) { - if (target_ptr->blind) - msg_print(_("‰½‚ç‚©‚̍UŒ‚‚É‚æ‚Á‚Ä‹C•ª‚ª‚æ‚­‚È‚Á‚½B", - "You are hit by something invigorating!")); - - (void)hp_player(target_ptr, ep_ptr->dam); - ep_ptr->dam = 0; -} - -void effect_player_old_speed(player_type *target_ptr, - effect_player_type *ep_ptr) { - if (target_ptr->blind) - msg_print(_("‰½‚©‚ōUŒ‚‚³‚ꂽI", "You are hit by something!")); - - (void)set_fast(target_ptr, target_ptr->fast + randint1(5), FALSE); - ep_ptr->dam = 0; -} - -void effect_player_old_slow(player_type *target_ptr) { - if (target_ptr->blind) - msg_print( - _("‰½‚©’x‚¢‚à‚̂ōUŒ‚‚³‚ꂽI", "You are hit by something slow!")); - - (void)set_slow(target_ptr, target_ptr->slow + randint0(4) + 4, FALSE); -} - -void effect_player_old_sleep(player_type *target_ptr, - effect_player_type *ep_ptr) { - if (target_ptr->free_act) - return; - - if (target_ptr->blind) - msg_print(_("–°‚Á‚Ä‚µ‚Ü‚Á‚½I", "You fall asleep!")); - - if (ironman_nightmare) { - msg_print(_("‹°‚낵‚¢ŒõŒi‚ª“ª‚É•‚‚©‚ñ‚Å‚«‚½B", - "A horrible vision enters your mind.")); - - /* Have some nightmares */ - sanity_blast(target_ptr, NULL, FALSE); - } - - set_paralyzed(target_ptr, target_ptr->paralyzed + ep_ptr->dam); - ep_ptr->dam = 0; -} +#include "effect/effect-player-oldies.h" /*! * @brief –‚–@‚ÌŒø‰Ê‚É‚æ‚Á‚Ä—lX‚ȃƒbƒZ[‚ðo—Í‚µ‚½‚è—^‚¦‚éƒ_ƒ[ƒW‚Ì‘Œ¸‚ðs‚Á‚½‚è‚·‚é @@ -159,7 +113,7 @@ void switch_effects_player(player_type *target_ptr, effect_player_type *ep_ptr) effect_player_old_slow(target_ptr); return; case GF_OLD_SLEEP: - effect_plyaer_old_sleep(target_ptr, ep_ptr); + effect_player_old_sleep(target_ptr, ep_ptr); return; case GF_MANA: case GF_SEEKER: -- 2.11.0