From 8dff8bc7d379e0c28bf505bbe16aa7c5101696af Mon Sep 17 00:00:00 2001 From: Hourier <66951241+Hourier@users.noreply.github.com> Date: Sun, 4 Sep 2022 10:35:59 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#2523=20blindness()=20=E3=82=92set?= =?utf8?q?=5Fblindness()=20=E3=81=AB=E5=B7=AE=E3=81=97=E6=9B=BF=E3=81=88?= =?utf8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-building/cmd-inn.cpp | 2 +- src/cmd-item/cmd-eat.cpp | 2 +- src/mspell/mspell-status.cpp | 2 +- src/object-activation/activation-others.cpp | 2 +- src/spell/spells-status.cpp | 10 +++++----- src/status/bad-status-setter.cpp | 4 ++-- src/status/bad-status-setter.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/cmd-building/cmd-inn.cpp b/src/cmd-building/cmd-inn.cpp index a62839c75..c5e034df4 100644 --- a/src/cmd-building/cmd-inn.cpp +++ b/src/cmd-building/cmd-inn.cpp @@ -131,7 +131,7 @@ static bool has_a_nightmare(PlayerType *player_ptr) static void back_to_health(PlayerType *player_ptr) { BadStatusSetter bss(player_ptr); - (void)bss.blindness(0); + (void)bss.set_blindness(0); (void)bss.confusion(0); player_ptr->effects()->stun()->reset(); player_ptr->chp = player_ptr->mhp; diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp index 13886114d..cf4e784aa 100644 --- a/src/cmd-item/cmd-eat.cpp +++ b/src/cmd-item/cmd-eat.cpp @@ -105,7 +105,7 @@ bool exe_eat_food_type_object(PlayerType *player_ptr, ObjectType *o_ptr) case SV_FOOD_CURE_POISON: return bss.set_poison(0); case SV_FOOD_CURE_BLINDNESS: - return bss.blindness(0); + return bss.set_blindness(0); case SV_FOOD_CURE_PARANOIA: return bss.fear(0); case SV_FOOD_CURE_CONFUSION: diff --git a/src/mspell/mspell-status.cpp b/src/mspell/mspell-status.cpp index 25b772d61..f267a7a34 100644 --- a/src/mspell/mspell-status.cpp +++ b/src/mspell/mspell-status.cpp @@ -331,7 +331,7 @@ MonsterSpellResult spell_RF5_BLIND(MONSTER_IDX m_idx, PlayerType *player_ptr, MO spell_badstatus_message_to_player(player_ptr, m_idx, msg, resist, saving_throw); if (!resist && !saving_throw) { - (void)BadStatusSetter(player_ptr).blindness(12 + randint0(4)); + (void)BadStatusSetter(player_ptr).set_blindness(12 + randint0(4)); } update_smart_learn(player_ptr, m_idx, DRS_BLIND); diff --git a/src/object-activation/activation-others.cpp b/src/object-activation/activation-others.cpp index a9c71c491..39e7345e7 100644 --- a/src/object-activation/activation-others.cpp +++ b/src/object-activation/activation-others.cpp @@ -379,7 +379,7 @@ bool activate_protection_elbereth(PlayerType *player_ptr) msg_print(_("エルベレスよ、我を護り給え！", "A Elbereth gilthoniel!")); create_rune_protection_one(player_ptr); (void)bss.fear(0); - (void)bss.blindness(0); + (void)bss.set_blindness(0); (void)bss.hallucination(0); set_blessed(player_ptr, randint0(25) + 25, true); set_bits(player_ptr->redraw, PR_STATS); diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp index ef6ada540..730e3c7e4 100644 --- a/src/spell/spells-status.cpp +++ b/src/spell/spells-status.cpp @@ -291,7 +291,7 @@ bool life_stream(PlayerType *player_ptr, bool message, bool virtue_change) restore_level(player_ptr); BadStatusSetter bss(player_ptr); (void)bss.set_poison(0); - (void)bss.blindness(0); + (void)bss.set_blindness(0); (void)bss.confusion(0); (void)bss.hallucination(0); (void)bss.stun(0); @@ -349,7 +349,7 @@ bool cure_light_wounds(PlayerType *player_ptr, DICE_NUMBER dice, DICE_SID sides) } BadStatusSetter bss(player_ptr); - if (bss.blindness(0)) { + if (bss.set_blindness(0)) { ident = true; } @@ -372,7 +372,7 @@ bool cure_serious_wounds(PlayerType *player_ptr, DICE_NUMBER dice, DICE_SID side } BadStatusSetter bss(player_ptr); - if (bss.blindness(0)) { + if (bss.set_blindness(0)) { ident = true; } @@ -399,7 +399,7 @@ bool cure_critical_wounds(PlayerType *player_ptr, int pow) } BadStatusSetter bss(player_ptr); - if (bss.blindness(0)) { + if (bss.set_blindness(0)) { ident = true; } @@ -434,7 +434,7 @@ bool true_healing(PlayerType *player_ptr, int pow) } BadStatusSetter bss(player_ptr); - if (bss.blindness(0)) { + if (bss.set_blindness(0)) { ident = true; } diff --git a/src/status/bad-status-setter.cpp b/src/status/bad-status-setter.cpp index 47ffb3b84..e6f6ed62d 100644 --- a/src/status/bad-status-setter.cpp +++ b/src/status/bad-status-setter.cpp @@ -48,7 +48,7 @@ BadStatusSetter::BadStatusSetter(PlayerType *player_ptr) * Note that blindness is currently the only thing which can affect\n * "player_can_see_bold()".\n */ -bool BadStatusSetter::blindness(const TIME_EFFECT tmp_v) +bool BadStatusSetter::set_blindness(const TIME_EFFECT tmp_v) { auto notice = false; auto v = std::clamp(tmp_v, 0, 10000); @@ -101,7 +101,7 @@ bool BadStatusSetter::blindness(const TIME_EFFECT tmp_v) bool BadStatusSetter::mod_blindness(const TIME_EFFECT tmp_v) { - return this->blindness(this->player_ptr->effects()->blindness()->current() + tmp_v); + return this->set_blindness(this->player_ptr->effects()->blindness()->current() + tmp_v); } /*! diff --git a/src/status/bad-status-setter.h b/src/status/bad-status-setter.h index 6de5cf90e..7cc5202a0 100644 --- a/src/status/bad-status-setter.h +++ b/src/status/bad-status-setter.h @@ -16,7 +16,7 @@ public: BadStatusSetter(PlayerType *player_ptr); virtual ~BadStatusSetter() = default; - bool blindness(const TIME_EFFECT tmp_v); + bool set_blindness(const TIME_EFFECT tmp_v); bool mod_blindness(const TIME_EFFECT tmp_v); bool confusion(const TIME_EFFECT tmp_v); bool mod_confusion(const TIME_EFFECT tmp_v); -- 2.11.0