OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ff7637f
)
[Refactor] #2523 poison() をset_poison() に改名した
author
Hourier
<66951241+Hourier@users.noreply.github.com>
Wed, 24 Aug 2022 10:16:37 +0000
(19:16 +0900)
committer
Hourier
<66951241+Hourier@users.noreply.github.com>
Wed, 24 Aug 2022 10:16:37 +0000
(19:16 +0900)
src/cmd-item/cmd-eat.cpp
patch
|
blob
|
history
src/object-activation/activation-switcher.cpp
patch
|
blob
|
history
src/object-use/quaff/quaff-effects.cpp
patch
|
blob
|
history
src/realm/realm-arcane.cpp
patch
|
blob
|
history
src/realm/realm-crusade.cpp
patch
|
blob
|
history
src/realm/realm-life.cpp
patch
|
blob
|
history
src/realm/realm-nature.cpp
patch
|
blob
|
history
src/spell/spells-staff-only.cpp
patch
|
blob
|
history
src/spell/spells-status.cpp
patch
|
blob
|
history
src/status/bad-status-setter.cpp
patch
|
blob
|
history
src/status/bad-status-setter.h
patch
|
blob
|
history
diff --git
a/src/cmd-item/cmd-eat.cpp
b/src/cmd-item/cmd-eat.cpp
index
d944a94
..
1388611
100644
(file)
--- a/
src/cmd-item/cmd-eat.cpp
+++ b/
src/cmd-item/cmd-eat.cpp
@@
-103,7
+103,7
@@
bool exe_eat_food_type_object(PlayerType *player_ptr, ObjectType *o_ptr)
(void)do_dec_stat(player_ptr, A_STR);
return true;
case SV_FOOD_CURE_POISON:
(void)do_dec_stat(player_ptr, A_STR);
return true;
case SV_FOOD_CURE_POISON:
- return bss.poison(0);
+ return bss.
set_
poison(0);
case SV_FOOD_CURE_BLINDNESS:
return bss.blindness(0);
case SV_FOOD_CURE_PARANOIA:
case SV_FOOD_CURE_BLINDNESS:
return bss.blindness(0);
case SV_FOOD_CURE_PARANOIA:
@@
-132,7
+132,7
@@
bool exe_eat_food_type_object(PlayerType *player_ptr, ObjectType *o_ptr)
return true;
case SV_FOOD_WAYBREAD:
msg_print(_("これはひじょうに美味だ。", "That tastes very good."));
return true;
case SV_FOOD_WAYBREAD:
msg_print(_("これはひじょうに美味だ。", "That tastes very good."));
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
(void)hp_player(player_ptr, damroll(4, 8));
return true;
case SV_FOOD_PINT_OF_ALE:
(void)hp_player(player_ptr, damroll(4, 8));
return true;
case SV_FOOD_PINT_OF_ALE:
diff --git
a/src/object-activation/activation-switcher.cpp
b/src/object-activation/activation-switcher.cpp
index
e21cc83
..
97d56a9
100644
(file)
--- a/
src/object-activation/activation-switcher.cpp
+++ b/
src/object-activation/activation-switcher.cpp
@@
-199,7
+199,7
@@
bool switch_activation(PlayerType *player_ptr, ObjectType **o_ptr_ptr, const act
msg_print(_("深青色に輝いている...", "It glows deep blue..."));
BadStatusSetter bss(player_ptr);
(void)bss.fear(0);
msg_print(_("深青色に輝いている...", "It glows deep blue..."));
BadStatusSetter bss(player_ptr);
(void)bss.fear(0);
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
return true;
}
case RandomArtActType::REST_EXP:
return true;
}
case RandomArtActType::REST_EXP:
diff --git
a/src/object-use/quaff/quaff-effects.cpp
b/src/object-use/quaff/quaff-effects.cpp
index
84b6312
..
889c90f
100644
(file)
--- a/
src/object-use/quaff/quaff-effects.cpp
+++ b/
src/object-use/quaff/quaff-effects.cpp
@@
-106,10
+106,10
@@
bool QuaffEffects::influence(const ObjectType &o_ref)
return set_tim_invis(this->player_ptr, this->player_ptr->tim_invis + 12 + randint1(12), false);
case SV_POTION_SLOW_POISON: {
const auto player_poison = this->player_ptr->effects()->poison();
return set_tim_invis(this->player_ptr, this->player_ptr->tim_invis + 12 + randint1(12), false);
case SV_POTION_SLOW_POISON: {
const auto player_poison = this->player_ptr->effects()->poison();
- return BadStatusSetter(this->player_ptr).poison(player_poison->current() / 2);
+ return BadStatusSetter(this->player_ptr).
set_
poison(player_poison->current() / 2);
}
case SV_POTION_CURE_POISON:
}
case SV_POTION_CURE_POISON:
- return BadStatusSetter(this->player_ptr).poison(0);
+ return BadStatusSetter(this->player_ptr).
set_
poison(0);
case SV_POTION_BOLDNESS:
return BadStatusSetter(this->player_ptr).fear(0);
case SV_POTION_SPEED:
case SV_POTION_BOLDNESS:
return BadStatusSetter(this->player_ptr).fear(0);
case SV_POTION_SPEED:
@@
-216,7
+216,7
@@
bool QuaffEffects::salt_water()
}
BadStatusSetter bss(this->player_ptr);
}
BadStatusSetter bss(this->player_ptr);
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
(void)bss.mod_paralysis(4);
return true;
}
(void)bss.mod_paralysis(4);
return true;
}
diff --git
a/src/realm/realm-arcane.cpp
b/src/realm/realm-arcane.cpp
index
bcd9ec3
..
a0ebbbd
100644
(file)
--- a/
src/realm/realm-arcane.cpp
+++ b/
src/realm/realm-arcane.cpp
@@
-326,7
+326,7
@@
concptr do_arcane_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessTyp
}
if (cast) {
}
if (cast) {
- (void)BadStatusSetter(player_ptr).poison(0);
+ (void)BadStatusSetter(player_ptr).
set_
poison(0);
}
break;
}
break;
diff --git
a/src/realm/realm-crusade.cpp
b/src/realm/realm-crusade.cpp
index
3891131
..
b7504ff
100644
(file)
--- a/
src/realm/realm-crusade.cpp
+++ b/
src/realm/realm-crusade.cpp
@@
-198,7
+198,7
@@
concptr do_crusade_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessTy
if (cast) {
BadStatusSetter bss(player_ptr);
(void)bss.cut(0);
if (cast) {
BadStatusSetter bss(player_ptr);
(void)bss.cut(0);
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
(void)bss.stun(0);
}
(void)bss.stun(0);
}
@@
-385,7
+385,7
@@
concptr do_crusade_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessTy
dispel_evil(player_ptr, randint1(dam_sides));
hp_player(player_ptr, heal);
(void)bss.fear(0);
dispel_evil(player_ptr, randint1(dam_sides));
hp_player(player_ptr, heal);
(void)bss.fear(0);
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
(void)bss.stun(0);
(void)bss.cut(0);
}
(void)bss.stun(0);
(void)bss.cut(0);
}
diff --git
a/src/realm/realm-life.cpp
b/src/realm/realm-life.cpp
index
f33d72a
..
8b2c7eb
100644
(file)
--- a/
src/realm/realm-life.cpp
+++ b/
src/realm/realm-life.cpp
@@
-178,7
+178,7
@@
concptr do_life_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessType
}
if (cast) {
}
if (cast) {
- (void)BadStatusSetter(player_ptr).poison(0);
+ (void)BadStatusSetter(player_ptr).
set_
poison(0);
}
break;
}
break;
diff --git
a/src/realm/realm-nature.cpp
b/src/realm/realm-nature.cpp
index
1d8aac9
..
281c7bc
100644
(file)
--- a/
src/realm/realm-nature.cpp
+++ b/
src/realm/realm-nature.cpp
@@
-253,7
+253,7
@@
concptr do_nature_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessTyp
BadStatusSetter bss(player_ptr);
hp_player(player_ptr, damroll(dice, sides));
(void)bss.cut(0);
BadStatusSetter bss(player_ptr);
hp_player(player_ptr, damroll(dice, sides));
(void)bss.cut(0);
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
}
}
break;
}
}
break;
diff --git
a/src/spell/spells-staff-only.cpp
b/src/spell/spells-staff-only.cpp
index
9ef7afe
..
a324905
100644
(file)
--- a/
src/spell/spells-staff-only.cpp
+++ b/
src/spell/spells-staff-only.cpp
@@
-30,7
+30,7
@@
bool cleansing_nova(PlayerType *player_ptr, bool magic, bool powerful)
}
BadStatusSetter bss(player_ptr);
}
BadStatusSetter bss(player_ptr);
- if (bss.poison(0)) {
+ if (bss.
set_
poison(0)) {
ident = true;
}
ident = true;
}
diff --git
a/src/spell/spells-status.cpp
b/src/spell/spells-status.cpp
index
37e3f98
..
ef6ada5
100644
(file)
--- a/
src/spell/spells-status.cpp
+++ b/
src/spell/spells-status.cpp
@@
-290,7
+290,7
@@
bool life_stream(PlayerType *player_ptr, bool message, bool virtue_change)
restore_level(player_ptr);
BadStatusSetter bss(player_ptr);
restore_level(player_ptr);
BadStatusSetter bss(player_ptr);
- (void)bss.poison(0);
+ (void)bss.
set_
poison(0);
(void)bss.blindness(0);
(void)bss.confusion(0);
(void)bss.hallucination(0);
(void)bss.blindness(0);
(void)bss.confusion(0);
(void)bss.hallucination(0);
@@
-407,7
+407,7
@@
bool cure_critical_wounds(PlayerType *player_ptr, int pow)
ident = true;
}
ident = true;
}
- if (bss.poison(0)) {
+ if (bss.
set_
poison(0)) {
ident = true;
}
ident = true;
}
@@
-442,7
+442,7
@@
bool true_healing(PlayerType *player_ptr, int pow)
ident = true;
}
ident = true;
}
- if (bss.poison(0)) {
+ if (bss.
set_
poison(0)) {
ident = true;
}
ident = true;
}
diff --git
a/src/status/bad-status-setter.cpp
b/src/status/bad-status-setter.cpp
index
b531443
..
e601cdd
100644
(file)
--- a/
src/status/bad-status-setter.cpp
+++ b/
src/status/bad-status-setter.cpp
@@
-182,7
+182,7
@@
bool BadStatusSetter::mod_confusion(const TIME_EFFECT tmp_v)
* @param v 継続時間
* @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
*/
* @param v 継続時間
* @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
*/
-bool BadStatusSetter::poison(const TIME_EFFECT tmp_v)
+bool BadStatusSetter::
set_
poison(const TIME_EFFECT tmp_v)
{
auto notice = false;
auto v = std::clamp<short>(tmp_v, 0, 10000);
{
auto notice = false;
auto v = std::clamp<short>(tmp_v, 0, 10000);
@@
-220,7
+220,7
@@
bool BadStatusSetter::poison(const TIME_EFFECT tmp_v)
bool BadStatusSetter::mod_poison(const TIME_EFFECT tmp_v)
{
bool BadStatusSetter::mod_poison(const TIME_EFFECT tmp_v)
{
- return this->poison(this->player_ptr->effects()->poison()->current() + tmp_v);
+ return this->
set_
poison(this->player_ptr->effects()->poison()->current() + tmp_v);
}
/*!
}
/*!
diff --git
a/src/status/bad-status-setter.h
b/src/status/bad-status-setter.h
index
f45d01b
..
6de5cf9
100644
(file)
--- a/
src/status/bad-status-setter.h
+++ b/
src/status/bad-status-setter.h
@@
-20,7
+20,7
@@
public:
bool mod_blindness(const TIME_EFFECT tmp_v);
bool confusion(const TIME_EFFECT tmp_v);
bool mod_confusion(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);
- bool poison(const TIME_EFFECT tmp_v);
+ bool
set_
poison(const TIME_EFFECT tmp_v);
bool mod_poison(const TIME_EFFECT tmp_v);
bool fear(const TIME_EFFECT tmp_v);
bool mod_fear(const TIME_EFFECT tmp_v);
bool mod_poison(const TIME_EFFECT tmp_v);
bool fear(const TIME_EFFECT tmp_v);
bool mod_fear(const TIME_EFFECT tmp_v);