OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] have_flag() を has_flag() に改名. / Rename have_flag() to has_flag().
[hengbandforosx/hengbandosx.git]
/
src
/
combat
/
slaying.c
diff --git
a/src/combat/slaying.c
b/src/combat/slaying.c
index
58d196e
..
b135eca
100644
(file)
--- a/
src/combat/slaying.c
+++ b/
src/combat/slaying.c
@@
-61,7
+61,7
@@
MULTIPLY mult_slaying(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *f
for (size_t i = 0; i < sizeof(slay_table) / sizeof(slay_table[0]); ++i) {
const struct slay_table_t *p = &slay_table[i];
for (size_t i = 0; i < sizeof(slay_table) / sizeof(slay_table[0]); ++i) {
const struct slay_table_t *p = &slay_table[i];
- if (!ha
ve
_flag(flgs, p->slay_flag) || !(atoffset(BIT_FLAGS, r_ptr, p->flag_offset) & p->affect_race_flag))
+ if (!ha
s
_flag(flgs, p->slay_flag) || !(atoffset(BIT_FLAGS, r_ptr, p->flag_offset) & p->affect_race_flag))
continue;
if (is_original_ap_and_seen(player_ptr, m_ptr)) {
continue;
if (is_original_ap_and_seen(player_ptr, m_ptr)) {
@@
-100,7
+100,7
@@
MULTIPLY mult_brand(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flg
for (size_t i = 0; i < sizeof(brand_table) / sizeof(brand_table[0]); ++i) {
const struct brand_table_t *p = &brand_table[i];
for (size_t i = 0; i < sizeof(brand_table) / sizeof(brand_table[0]); ++i) {
const struct brand_table_t *p = &brand_table[i];
- if (!ha
ve
_flag(flgs, p->brand_flag))
+ if (!ha
s
_flag(flgs, p->brand_flag))
continue;
/* Notice immunity */
continue;
/* Notice immunity */
@@
-184,7
+184,7
@@
HIT_POINT calc_attack_damage_with_slay(player_type *attacker_ptr, object_type *o
mult = mult_hissatsu(attacker_ptr, mult, flgs, m_ptr, mode);
}
mult = mult_hissatsu(attacker_ptr, mult, flgs, m_ptr, mode);
}
- if ((attacker_ptr->pclass != CLASS_SAMURAI) && (ha
ve
_flag(flgs, TR_FORCE_WEAPON)) && (attacker_ptr->csp > (o_ptr->dd * o_ptr->ds / 5))) {
+ if ((attacker_ptr->pclass != CLASS_SAMURAI) && (ha
s
_flag(flgs, TR_FORCE_WEAPON)) && (attacker_ptr->csp > (o_ptr->dd * o_ptr->ds / 5))) {
attacker_ptr->csp -= (1 + (o_ptr->dd * o_ptr->ds / 5));
attacker_ptr->redraw |= (PR_MANA);
mult = mult * 3 / 2 + 20;
attacker_ptr->csp -= (1 + (o_ptr->dd * o_ptr->ds / 5));
attacker_ptr->redraw |= (PR_MANA);
mult = mult * 3 / 2 + 20;