• R/O
  • HTTP
  • SSH
  • HTTPS

hengbandosx: コミット

The master and develop branches track hengband.

OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.


コミットメタ情報

リビジョンc9ad4b181961d83f4057c7ed841c6e17b87b5484 (tree)
日時2020-10-21 03:45:18
作者Eric Branlund <ebranlund@fast...>
コミッターEric Branlund

ログメッセージ

Merge branch 'For2.2.2-Refactoring' into For2.2.2-Refactoring-Cocoa2

変更サマリ

差分

--- a/src/action/run-execution.c
+++ b/src/action/run-execution.c
@@ -232,7 +232,7 @@ static bool run_test(player_type *creature_ptr)
232232 notice = FALSE;
233233 } else if (find_ignore_stairs && has_flag(f_ptr->flags, FF_STAIRS)) {
234234 notice = FALSE;
235- } else if (has_flag(f_ptr->flags, FF_LAVA) && (is_immune_fire(creature_ptr) || is_invuln(creature_ptr))) {
235+ } else if (has_flag(f_ptr->flags, FF_LAVA) && (has_immune_fire(creature_ptr) || is_invuln(creature_ptr))) {
236236 notice = FALSE;
237237 } else if (has_flag(f_ptr->flags, FF_WATER) && has_flag(f_ptr->flags, FF_DEEP)
238238 && (creature_ptr->levitation || creature_ptr->can_swim || (creature_ptr->total_weight <= weight_limit(creature_ptr)))) {
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -91,7 +91,7 @@ void process_player_hp_mp(player_type *creature_ptr)
9191 }
9292 }
9393
94- if (has_flag(f_ptr->flags, FF_LAVA) && !is_invuln(creature_ptr) && !is_immune_fire(creature_ptr)) {
94+ if (has_flag(f_ptr->flags, FF_LAVA) && !is_invuln(creature_ptr) && !has_immune_fire(creature_ptr)) {
9595 int damage = 0;
9696
9797 if (has_flag(f_ptr->flags, FF_DEEP)) {
@@ -130,7 +130,7 @@ void process_player_hp_mp(player_type *creature_ptr)
130130 }
131131 }
132132
133- if (has_flag(f_ptr->flags, FF_COLD_PUDDLE) && !is_invuln(creature_ptr) && !is_immune_cold(creature_ptr)) {
133+ if (has_flag(f_ptr->flags, FF_COLD_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_cold(creature_ptr)) {
134134 int damage = 0;
135135
136136 if (has_flag(f_ptr->flags, FF_DEEP)) {
@@ -165,7 +165,7 @@ void process_player_hp_mp(player_type *creature_ptr)
165165 }
166166 }
167167
168- if (has_flag(f_ptr->flags, FF_ELEC_PUDDLE) && !is_invuln(creature_ptr) && !is_immune_elec(creature_ptr)) {
168+ if (has_flag(f_ptr->flags, FF_ELEC_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_elec(creature_ptr)) {
169169 int damage = 0;
170170
171171 if (has_flag(f_ptr->flags, FF_DEEP)) {
@@ -200,7 +200,7 @@ void process_player_hp_mp(player_type *creature_ptr)
200200 }
201201 }
202202
203- if (has_flag(f_ptr->flags, FF_ACID_PUDDLE) && !is_invuln(creature_ptr) && !is_immune_acid(creature_ptr)) {
203+ if (has_flag(f_ptr->flags, FF_ACID_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_acid(creature_ptr)) {
204204 int damage = 0;
205205
206206 if (has_flag(f_ptr->flags, FF_DEEP)) {
@@ -282,7 +282,7 @@ void process_player_hp_mp(player_type *creature_ptr)
282282
283283 if (creature_ptr->riding) {
284284 HIT_POINT damage;
285- if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_FIRE) && !is_immune_fire(creature_ptr)) {
285+ if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_FIRE) && !has_immune_fire(creature_ptr)) {
286286 damage = r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].level / 2;
287287 if (is_specific_player_race(creature_ptr, RACE_ENT))
288288 damage += damage / 3;
@@ -293,7 +293,7 @@ void process_player_hp_mp(player_type *creature_ptr)
293293 msg_print(_("熱い!", "It's hot!"));
294294 take_hit(creature_ptr, DAMAGE_NOESCAPE, damage, _("炎のオーラ", "Fire aura"), -1);
295295 }
296- if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_ELEC) && !is_immune_elec(creature_ptr)) {
296+ if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_ELEC) && !has_immune_elec(creature_ptr)) {
297297 damage = r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].level / 2;
298298 if (is_specific_player_race(creature_ptr, RACE_ANDROID))
299299 damage += damage / 3;
@@ -304,7 +304,7 @@ void process_player_hp_mp(player_type *creature_ptr)
304304 msg_print(_("痛い!", "It hurts!"));
305305 take_hit(creature_ptr, DAMAGE_NOESCAPE, damage, _("電気のオーラ", "Elec aura"), -1);
306306 }
307- if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags3 & RF3_AURA_COLD) && !is_immune_cold(creature_ptr)) {
307+ if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags3 & RF3_AURA_COLD) && !has_immune_cold(creature_ptr)) {
308308 damage = r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].level / 2;
309309 if (creature_ptr->resist_cold)
310310 damage = damage / 3;
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -139,7 +139,7 @@ void effect_player_plasma(player_type *target_ptr, effect_player_type *ep_ptr)
139139 (void)set_stun(target_ptr, target_ptr->stun + plus_stun);
140140 }
141141
142- if (!(target_ptr->resist_fire || is_oppose_fire(target_ptr) || is_immune_fire(target_ptr)))
142+ if (!(target_ptr->resist_fire || is_oppose_fire(target_ptr) || has_immune_fire(target_ptr)))
143143 inventory_damage(target_ptr, set_acid_destroy, 3);
144144 }
145145
@@ -346,7 +346,7 @@ void effect_player_lite(player_type *target_ptr, effect_player_type *ep_ptr)
346346 {
347347 if (target_ptr->blind)
348348 msg_print(_("何かで攻撃された!", "You are hit by something!"));
349- if (!target_ptr->blind && !target_ptr->resist_blind && !check_multishadow(target_ptr)) {
349+ if (!target_ptr->blind && !target_ptr->resist_lite && !target_ptr->resist_blind && !check_multishadow(target_ptr)) {
350350 (void)set_blind(target_ptr, target_ptr->blind + randint1(5) + 2);
351351 }
352352
@@ -377,7 +377,7 @@ void effect_player_dark(player_type *target_ptr, effect_player_type *ep_ptr)
377377
378378 ep_ptr->dam = ep_ptr->dam * calc_dark_damage_rate(target_ptr, CALC_RAND) / 100;
379379
380- if (!target_ptr->blind && !target_ptr->resist_blind && !check_multishadow(target_ptr)) {
380+ if (!target_ptr->blind && !target_ptr->resist_dark && !target_ptr->resist_blind && !check_multishadow(target_ptr)) {
381381 (void)set_blind(target_ptr, target_ptr->blind + randint1(5) + 2);
382382 }
383383
@@ -544,7 +544,7 @@ void effect_player_meteor(player_type *target_ptr, effect_player_type *ep_ptr)
544544
545545 ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
546546 if (!target_ptr->resist_shard || one_in_(13)) {
547- if (!is_immune_fire(target_ptr))
547+ if (!has_immune_fire(target_ptr))
548548 inventory_damage(target_ptr, set_fire_destroy, 2);
549549 inventory_damage(target_ptr, set_cold_destroy, 2);
550550 }
@@ -568,7 +568,7 @@ void effect_player_icee(player_type *target_ptr, effect_player_type *ep_ptr)
568568 }
569569
570570 if ((!(target_ptr->resist_cold || is_oppose_cold(target_ptr))) || one_in_(12)) {
571- if (!is_immune_cold(target_ptr))
571+ if (!has_immune_cold(target_ptr))
572572 inventory_damage(target_ptr, set_cold_destroy, 3);
573573 }
574574 }
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -1151,7 +1151,7 @@ bool cave_player_teleportable_bold(player_type *player_ptr, POSITION y, POSITION
11511151 return FALSE;
11521152 }
11531153
1154- if (has_flag(f_ptr->flags, FF_LAVA) && !is_immune_fire(player_ptr) && !is_invuln(player_ptr)) {
1154+ if (has_flag(f_ptr->flags, FF_LAVA) && !has_immune_fire(player_ptr) && !is_invuln(player_ptr)) {
11551155 /* Always forbid deep lava */
11561156 if (has_flag(f_ptr->flags, FF_DEEP))
11571157 return FALSE;
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -545,7 +545,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what)
545545 if (is_oppose_acid(player_ptr))
546546 m_ptr->smart |= SM_OPP_ACID;
547547
548- if (is_immune_acid(player_ptr))
548+ if (has_immune_acid(player_ptr))
549549 m_ptr->smart |= SM_IMM_ACID;
550550
551551 break;
@@ -556,7 +556,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what)
556556 if (is_oppose_elec(player_ptr))
557557 m_ptr->smart |= SM_OPP_ELEC;
558558
559- if (is_immune_elec(player_ptr))
559+ if (has_immune_elec(player_ptr))
560560 m_ptr->smart |= SM_IMM_ELEC;
561561
562562 break;
@@ -567,7 +567,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what)
567567 if (is_oppose_fire(player_ptr))
568568 m_ptr->smart |= SM_OPP_FIRE;
569569
570- if (is_immune_fire(player_ptr))
570+ if (has_immune_fire(player_ptr))
571571 m_ptr->smart |= SM_IMM_FIRE;
572572
573573 break;
@@ -578,7 +578,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what)
578578 if (is_oppose_cold(player_ptr))
579579 m_ptr->smart |= SM_OPP_COLD;
580580
581- if (is_immune_cold(player_ptr))
581+ if (has_immune_cold(player_ptr))
582582 m_ptr->smart |= SM_IMM_COLD;
583583
584584 break;
--- a/src/mspell/element-resistance-checker.c
+++ b/src/mspell/element-resistance-checker.c
@@ -15,7 +15,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr)
1515 if (is_oppose_acid(target_ptr))
1616 msr_ptr->smart |= SM_OPP_ACID;
1717
18- if (is_immune_acid(target_ptr))
18+ if (has_immune_acid(target_ptr))
1919 msr_ptr->smart |= SM_IMM_ACID;
2020
2121 if (target_ptr->resist_elec)
@@ -24,7 +24,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr)
2424 if (is_oppose_elec(target_ptr))
2525 msr_ptr->smart |= SM_OPP_ELEC;
2626
27- if (is_immune_elec(target_ptr))
27+ if (has_immune_elec(target_ptr))
2828 msr_ptr->smart |= SM_IMM_ELEC;
2929
3030 if (target_ptr->resist_fire)
@@ -33,7 +33,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr)
3333 if (is_oppose_fire(target_ptr))
3434 msr_ptr->smart |= SM_OPP_FIRE;
3535
36- if (is_immune_fire(target_ptr))
36+ if (has_immune_fire(target_ptr))
3737 msr_ptr->smart |= SM_IMM_FIRE;
3838
3939 if (target_ptr->resist_cold)
@@ -42,7 +42,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr)
4242 if (is_oppose_cold(target_ptr))
4343 msr_ptr->smart |= SM_OPP_COLD;
4444
45- if (is_immune_cold(target_ptr))
45+ if (has_immune_cold(target_ptr))
4646 msr_ptr->smart |= SM_IMM_COLD;
4747
4848 if (target_ptr->resist_pois)
--- a/src/mspell/mspell-judgement.c
+++ b/src/mspell/mspell-judgement.c
@@ -255,7 +255,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx)
255255 monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[m_idx];
256256 monster_race *r_ptr = &r_info[m_ptr->r_idx];
257257 if (r_ptr->flags4 & RF4_BR_ACID) {
258- if (!is_immune_acid(creature_ptr) && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST)))
258+ if (!has_immune_acid(creature_ptr) && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST)))
259259 return TRUE;
260260
261261 if (creature_ptr->special_defense & DEFENSE_ACID)
@@ -264,7 +264,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx)
264264
265265 if (r_ptr->flags4 & RF4_BR_FIRE) {
266266 if (!((creature_ptr->prace == RACE_BALROG) && creature_ptr->lev > 44)) {
267- if (!is_immune_fire(creature_ptr) && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST)))
267+ if (!has_immune_fire(creature_ptr) && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST)))
268268 return TRUE;
269269
270270 if (creature_ptr->special_defense & DEFENSE_FIRE)
@@ -273,7 +273,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx)
273273 }
274274
275275 if (r_ptr->flags4 & RF4_BR_ELEC) {
276- if (!is_immune_elec(creature_ptr) && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST)))
276+ if (!has_immune_elec(creature_ptr) && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST)))
277277 return TRUE;
278278
279279 if (creature_ptr->special_defense & DEFENSE_ELEC)
@@ -281,7 +281,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx)
281281 }
282282
283283 if (r_ptr->flags4 & RF4_BR_COLD) {
284- if (!is_immune_cold(creature_ptr) && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST)))
284+ if (!has_immune_cold(creature_ptr) && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST)))
285285 return TRUE;
286286
287287 if (creature_ptr->special_defense & DEFENSE_COLD)
--- a/src/object-use/read-execution.c
+++ b/src/object-use/read-execution.c
@@ -414,7 +414,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
414414 }
415415 case SV_SCROLL_FIRE: {
416416 fire_ball(creature_ptr, GF_FIRE, 0, 666, 4);
417- if (!(is_oppose_fire(creature_ptr) || creature_ptr->resist_fire || is_immune_fire(creature_ptr)))
417+ if (!(is_oppose_fire(creature_ptr) || creature_ptr->resist_fire || has_immune_fire(creature_ptr)))
418418 take_hit(creature_ptr, DAMAGE_NOESCAPE, 50 + randint1(50), _("炎の巻物", "a Scroll of Fire"), -1);
419419
420420 ident = TRUE;
@@ -422,7 +422,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
422422 }
423423 case SV_SCROLL_ICE: {
424424 fire_ball(creature_ptr, GF_ICE, 0, 777, 4);
425- if (!(is_oppose_cold(creature_ptr) || creature_ptr->resist_cold || is_immune_cold(creature_ptr)))
425+ if (!(is_oppose_cold(creature_ptr) || creature_ptr->resist_cold || has_immune_cold(creature_ptr)))
426426 take_hit(creature_ptr, DAMAGE_NOESCAPE, 100 + randint1(100), _("氷の巻物", "a Scroll of Ice"), -1);
427427
428428 ident = TRUE;
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -88,7 +88,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
8888 /* Vulnerability, resistance and immunity */
8989 switch (typ) {
9090 case GF_ELEC:
91- if (is_immune_elec(target_ptr)) {
91+ if (has_immune_elec(target_ptr)) {
9292 ignore_wraith_form = TRUE;
9393 }
9494 dam = dam * calc_elec_damage_rate(target_ptr) / 100;
@@ -99,7 +99,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
9999 break;
100100
101101 case GF_ACID:
102- if (is_immune_acid(target_ptr)) {
102+ if (has_immune_acid(target_ptr)) {
103103 ignore_wraith_form = TRUE;
104104 }
105105 dam = dam * calc_acid_damage_rate(target_ptr) / 100;
@@ -107,14 +107,14 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
107107
108108 case GF_COLD:
109109 case GF_ICE:
110- if (is_immune_cold(target_ptr)) {
110+ if (has_immune_cold(target_ptr)) {
111111 ignore_wraith_form = TRUE;
112112 }
113113 dam = dam * calc_cold_damage_rate(target_ptr) / 100;
114114 break;
115115
116116 case GF_FIRE:
117- if (is_immune_fire(target_ptr)) {
117+ if (has_immune_fire(target_ptr)) {
118118 dam = 0;
119119 ignore_wraith_form = TRUE;
120120 break;
--- a/src/player-info/resistance-info.c
+++ b/src/player-info/resistance-info.c
@@ -6,7 +6,7 @@
66
77 void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_ptr)
88 {
9- if (is_immune_acid(creature_ptr)) {
9+ if (has_immune_acid(creature_ptr)) {
1010 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚ÍŽ_‚ɑ΂·‚銮‘S‚È‚é–Ɖu‚ðŽ‚Á‚Ä‚¢‚éB", "You are completely immune to acid.");
1111 } else if (creature_ptr->resist_acid && is_oppose_acid(creature_ptr)) {
1212 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚ÍŽ_‚Ö‚Ì‹­—͂ȑϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You resist acid exceptionally well.");
@@ -14,7 +14,7 @@ void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_p
1414 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚ÍŽ_‚ւ̑ϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You are resistant to acid.");
1515 }
1616
17- if (is_immune_elec(creature_ptr)) {
17+ if (has_immune_elec(creature_ptr)) {
1818 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚Í“dŒ‚‚ɑ΂·‚銮‘S‚È‚é–Ɖu‚ðŽ‚Á‚Ä‚¢‚éB", "You are completely immune to lightning.");
1919 } else if (creature_ptr->resist_elec && is_oppose_elec(creature_ptr)) {
2020 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚Í“dŒ‚‚Ö‚Ì‹­—͂ȑϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You resist lightning exceptionally well.");
@@ -22,11 +22,11 @@ void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_p
2222 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚Í“dŒ‚‚ւ̑ϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You are resistant to lightning.");
2323 }
2424
25- if (is_specific_player_race(creature_ptr, RACE_ANDROID) && !is_immune_elec(creature_ptr)) {
25+ if (is_specific_player_race(creature_ptr, RACE_ANDROID) && !has_immune_elec(creature_ptr)) {
2626 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚Í“dŒ‚‚ÉŽã‚¢B", "You are susceptible to damage from lightning.");
2727 }
2828
29- if (is_immune_fire(creature_ptr)) {
29+ if (has_immune_fire(creature_ptr)) {
3030 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚͉΂ɑ΂·‚銮‘S‚È‚é–Ɖu‚ðŽ‚Á‚Ä‚¢‚éB", "You are completely immune to fire.");
3131 } else if (creature_ptr->resist_fire && is_oppose_fire(creature_ptr)) {
3232 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚͉΂ւ̋­—͂ȑϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You resist fire exceptionally well.");
@@ -34,11 +34,11 @@ void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_p
3434 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚͉΂ւ̑ϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You are resistant to fire.");
3535 }
3636
37- if (is_specific_player_race(creature_ptr, RACE_ENT) && !is_immune_fire(creature_ptr)) {
37+ if (is_specific_player_race(creature_ptr, RACE_ENT) && !has_immune_fire(creature_ptr)) {
3838 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚͉΂ɎアB", "You are susceptible to damage from fire.");
3939 }
4040
41- if (is_immune_cold(creature_ptr)) {
41+ if (has_immune_cold(creature_ptr)) {
4242 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚Í—â‹C‚ɑ΂·‚銮‘S‚È‚é–Ɖu‚ðŽ‚Á‚Ä‚¢‚éB", "You are completely immune to cold.");
4343 } else if (creature_ptr->resist_cold && is_oppose_cold(creature_ptr)) {
4444 si_ptr->info[si_ptr->line++] = _("‚ ‚È‚½‚Í—â‹C‚Ö‚Ì‹­—͂ȑϐ«‚ðŽ‚Á‚Ä‚¢‚éB", "You resist cold exceptionally well.");
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -229,7 +229,7 @@ HIT_POINT fire_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int
229229 bool double_resist = is_oppose_fire(creature_ptr);
230230
231231 /* Totally immune */
232- if (is_immune_fire(creature_ptr) || (dam <= 0)) {
232+ if (has_immune_fire(creature_ptr) || (dam <= 0)) {
233233 learn_spell(creature_ptr, monspell);
234234 return 0;
235235 }
@@ -267,7 +267,7 @@ HIT_POINT cold_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int
267267 bool double_resist = is_oppose_cold(creature_ptr);
268268
269269 /* Total immunity */
270- if (is_immune_cold(creature_ptr) || (dam <= 0)) {
270+ if (has_immune_cold(creature_ptr) || (dam <= 0)) {
271271 learn_spell(creature_ptr, monspell);
272272 return 0;
273273 }
@@ -654,15 +654,15 @@ static void process_aura_damage(monster_type *m_ptr, player_type *touched_ptr, b
654654 */
655655 void touch_zap_player(monster_type *m_ptr, player_type *touched_ptr)
656656 {
657- process_aura_damage(m_ptr, touched_ptr, (bool)is_immune_fire(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2),
657+ process_aura_damage(m_ptr, touched_ptr, (bool)has_immune_fire(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2),
658658 RF2_AURA_FIRE,
659659 fire_dam,
660660 _("突然とても熱くなった!", "You are suddenly very hot!"));
661- process_aura_damage(m_ptr, touched_ptr, (bool)is_immune_cold(touched_ptr), offsetof(monster_race, flags3), offsetof(monster_race, r_flags3),
661+ process_aura_damage(m_ptr, touched_ptr, (bool)has_immune_cold(touched_ptr), offsetof(monster_race, flags3), offsetof(monster_race, r_flags3),
662662 RF3_AURA_COLD,
663663 cold_dam,
664664 _("突然とても寒くなった!", "You are suddenly very cold!"));
665- process_aura_damage(m_ptr, touched_ptr, (bool)is_immune_elec(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2),
665+ process_aura_damage(m_ptr, touched_ptr, (bool)has_immune_elec(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2),
666666 RF2_AURA_ELEC,
667667 elec_dam,
668668 _("電撃をくらった!", "You get zapped!"));
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -278,11 +278,11 @@ bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat)
278278 return TRUE;
279279 break;
280280 case TRAP_FIRE:
281- if (is_immune_fire(creature_ptr))
281+ if (has_immune_fire(creature_ptr))
282282 return TRUE;
283283 break;
284284 case TRAP_ACID:
285- if (is_immune_acid(creature_ptr))
285+ if (has_immune_acid(creature_ptr))
286286 return TRUE;
287287 break;
288288 case TRAP_BLIND:
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -56,7 +56,7 @@ static BIT_FLAGS check_equipment_flags(player_type *creature_ptr, tr_type tr_fla
5656 /*!
5757 * @brief クリーチャーが壁破壊進行を持っているかを返す。
5858 */
59-bool is_kill_wall(player_type *creature_ptr)
59+bool has_kill_wall(player_type *creature_ptr)
6060 {
6161 if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || music_singing(creature_ptr, MUSIC_WALL)) {
6262 return TRUE;
@@ -75,7 +75,7 @@ bool is_kill_wall(player_type *creature_ptr)
7575 /*!
7676 * @brief クリーチャーが壁通過を持っているかを返す。
7777 */
78-bool is_pass_wall(player_type *creature_ptr)
78+bool has_pass_wall(player_type *creature_ptr)
7979 {
8080 bool pow = FALSE;
8181
@@ -96,7 +96,7 @@ bool is_pass_wall(player_type *creature_ptr)
9696 /*!
9797 * @brief クリーチャーが強力射を持っているかを返す。
9898 */
99-BIT_FLAGS is_xtra_might(player_type *creature_ptr)
99+BIT_FLAGS has_xtra_might(player_type *creature_ptr)
100100 {
101101 BIT_FLAGS result = 0L;
102102 result |= check_equipment_flags(creature_ptr, TR_XTRA_MIGHT);
@@ -106,7 +106,7 @@ BIT_FLAGS is_xtra_might(player_type *creature_ptr)
106106 /*!
107107 * @brief クリーチャーが邪悪感知を持っているかを返す。
108108 */
109-BIT_FLAGS is_esp_evil(player_type *creature_ptr)
109+BIT_FLAGS has_esp_evil(player_type *creature_ptr)
110110 {
111111 BIT_FLAGS result = 0L;
112112 if (creature_ptr->realm1 == REALM_HEX) {
@@ -120,7 +120,7 @@ BIT_FLAGS is_esp_evil(player_type *creature_ptr)
120120 /*!
121121 * @brief クリーチャーが自然界の動物感知を持っているかを返す。
122122 */
123-BIT_FLAGS is_esp_animal(player_type *creature_ptr)
123+BIT_FLAGS has_esp_animal(player_type *creature_ptr)
124124 {
125125 BIT_FLAGS result = 0L;
126126 result |= check_equipment_flags(creature_ptr, TR_ESP_ANIMAL);
@@ -130,77 +130,77 @@ BIT_FLAGS is_esp_animal(player_type *creature_ptr)
130130 /*!
131131 * @brief クリーチャーがアンデッド感知を持っているかを返す。
132132 */
133-BIT_FLAGS is_esp_undead(player_type *creature_ptr)
133+BIT_FLAGS has_esp_undead(player_type *creature_ptr)
134134 {
135135 BIT_FLAGS result = 0L;
136136 result |= check_equipment_flags(creature_ptr, TR_ESP_UNDEAD);
137137 return result;
138138 }
139139
140-BIT_FLAGS is_esp_demon(player_type *creature_ptr)
140+BIT_FLAGS has_esp_demon(player_type *creature_ptr)
141141 {
142142 BIT_FLAGS result = 0L;
143143 result |= check_equipment_flags(creature_ptr, TR_ESP_DEMON);
144144 return result;
145145 }
146146
147-BIT_FLAGS is_esp_orc(player_type *creature_ptr)
147+BIT_FLAGS has_esp_orc(player_type *creature_ptr)
148148 {
149149 BIT_FLAGS result = 0L;
150150 result |= check_equipment_flags(creature_ptr, TR_ESP_ORC);
151151 return result;
152152 }
153153
154-BIT_FLAGS is_esp_troll(player_type *creature_ptr)
154+BIT_FLAGS has_esp_troll(player_type *creature_ptr)
155155 {
156156 BIT_FLAGS result = 0L;
157157 result |= check_equipment_flags(creature_ptr, TR_ESP_TROLL);
158158 return result;
159159 }
160160
161-BIT_FLAGS is_esp_giant(player_type *creature_ptr)
161+BIT_FLAGS has_esp_giant(player_type *creature_ptr)
162162 {
163163 BIT_FLAGS result = 0L;
164164 result |= check_equipment_flags(creature_ptr, TR_ESP_GIANT);
165165 return result;
166166 }
167167
168-BIT_FLAGS is_esp_dragon(player_type *creature_ptr)
168+BIT_FLAGS has_esp_dragon(player_type *creature_ptr)
169169 {
170170 BIT_FLAGS result = 0L;
171171 result |= check_equipment_flags(creature_ptr, TR_ESP_DRAGON);
172172 return result;
173173 }
174174
175-BIT_FLAGS is_esp_human(player_type *creature_ptr)
175+BIT_FLAGS has_esp_human(player_type *creature_ptr)
176176 {
177177 BIT_FLAGS result = 0L;
178178 result |= check_equipment_flags(creature_ptr, TR_ESP_HUMAN);
179179 return result;
180180 }
181181
182-BIT_FLAGS is_esp_good(player_type *creature_ptr)
182+BIT_FLAGS has_esp_good(player_type *creature_ptr)
183183 {
184184 BIT_FLAGS result = 0L;
185185 result |= check_equipment_flags(creature_ptr, TR_ESP_GOOD);
186186 return result;
187187 }
188188
189-BIT_FLAGS is_esp_nonliving(player_type *creature_ptr)
189+BIT_FLAGS has_esp_nonliving(player_type *creature_ptr)
190190 {
191191 BIT_FLAGS result = 0L;
192192 result |= check_equipment_flags(creature_ptr, TR_ESP_GOOD);
193193 return result;
194194 }
195195
196-BIT_FLAGS is_esp_unique(player_type *creature_ptr)
196+BIT_FLAGS has_esp_unique(player_type *creature_ptr)
197197 {
198198 BIT_FLAGS result = 0L;
199199 result |= check_equipment_flags(creature_ptr, TR_ESP_UNIQUE);
200200 return result;
201201 }
202202
203-BIT_FLAGS is_esp_telepathy(player_type *creature_ptr)
203+BIT_FLAGS has_esp_telepathy(player_type *creature_ptr)
204204 {
205205 BIT_FLAGS result = 0L;
206206
@@ -571,7 +571,7 @@ BIT_FLAGS has_free_act(player_type *creature_ptr)
571571 return result;
572572 }
573573
574-BIT_FLAGS is_sustain_str(player_type *creature_ptr)
574+BIT_FLAGS has_sustain_str(player_type *creature_ptr)
575575 {
576576 BIT_FLAGS result = 0L;
577577
@@ -595,7 +595,7 @@ BIT_FLAGS is_sustain_str(player_type *creature_ptr)
595595 return result;
596596 }
597597
598-BIT_FLAGS is_sustain_int(player_type *creature_ptr)
598+BIT_FLAGS has_sustain_int(player_type *creature_ptr)
599599 {
600600 BIT_FLAGS result = 0L;
601601
@@ -615,7 +615,7 @@ BIT_FLAGS is_sustain_int(player_type *creature_ptr)
615615 return result;
616616 }
617617
618-BIT_FLAGS is_sustain_wis(player_type *creature_ptr)
618+BIT_FLAGS has_sustain_wis(player_type *creature_ptr)
619619 {
620620 BIT_FLAGS result = 0L;
621621
@@ -639,7 +639,7 @@ BIT_FLAGS is_sustain_wis(player_type *creature_ptr)
639639 return result;
640640 }
641641
642-BIT_FLAGS is_sustain_dex(player_type *creature_ptr)
642+BIT_FLAGS has_sustain_dex(player_type *creature_ptr)
643643 {
644644 BIT_FLAGS result = 0L;
645645 if (creature_ptr->pclass == CLASS_BERSERKER) {
@@ -661,7 +661,7 @@ BIT_FLAGS is_sustain_dex(player_type *creature_ptr)
661661 return result;
662662 }
663663
664-BIT_FLAGS is_sustain_con(player_type *creature_ptr)
664+BIT_FLAGS has_sustain_con(player_type *creature_ptr)
665665 {
666666 BIT_FLAGS result = 0L;
667667 if (creature_ptr->pclass == CLASS_BERSERKER) {
@@ -684,7 +684,7 @@ BIT_FLAGS is_sustain_con(player_type *creature_ptr)
684684 return result;
685685 }
686686
687-BIT_FLAGS is_sustain_chr(player_type *creature_ptr)
687+BIT_FLAGS has_sustain_chr(player_type *creature_ptr)
688688 {
689689 BIT_FLAGS result = 0L;
690690
@@ -934,7 +934,7 @@ void has_extra_blow(player_type *creature_ptr)
934934 }
935935 }
936936
937-BIT_FLAGS is_resist_acid(player_type *creature_ptr)
937+BIT_FLAGS has_resist_acid(player_type *creature_ptr)
938938 {
939939 BIT_FLAGS result = 0L;
940940
@@ -954,13 +954,13 @@ BIT_FLAGS is_resist_acid(player_type *creature_ptr)
954954 result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
955955 }
956956
957- result |= is_immune_acid(creature_ptr);
957+ result |= has_immune_acid(creature_ptr);
958958
959959 result |= check_equipment_flags(creature_ptr, TR_RES_ACID);
960960 return result;
961961 }
962962
963-BIT_FLAGS is_vuln_acid(player_type *creature_ptr)
963+BIT_FLAGS has_vuln_acid(player_type *creature_ptr)
964964 {
965965 BIT_FLAGS result = 0L;
966966 if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
@@ -973,7 +973,7 @@ BIT_FLAGS is_vuln_acid(player_type *creature_ptr)
973973 return result;
974974 }
975975
976-BIT_FLAGS is_resist_elec(player_type *creature_ptr)
976+BIT_FLAGS has_resist_elec(player_type *creature_ptr)
977977 {
978978 BIT_FLAGS result = 0L;
979979
@@ -992,11 +992,11 @@ BIT_FLAGS is_resist_elec(player_type *creature_ptr)
992992 }
993993
994994 result |= check_equipment_flags(creature_ptr, TR_RES_ELEC);
995- result |= is_immune_elec(creature_ptr);
995+ result |= has_immune_elec(creature_ptr);
996996 return result;
997997 }
998998
999-BIT_FLAGS is_vuln_elec(player_type *creature_ptr)
999+BIT_FLAGS has_vuln_elec(player_type *creature_ptr)
10001000 {
10011001 BIT_FLAGS result = 0L;
10021002 if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
@@ -1013,7 +1013,7 @@ BIT_FLAGS is_vuln_elec(player_type *creature_ptr)
10131013 return result;
10141014 }
10151015
1016-BIT_FLAGS is_resist_fire(player_type *creature_ptr)
1016+BIT_FLAGS has_resist_fire(player_type *creature_ptr)
10171017 {
10181018 BIT_FLAGS result = 0L;
10191019
@@ -1038,11 +1038,11 @@ BIT_FLAGS is_resist_fire(player_type *creature_ptr)
10381038 }
10391039
10401040 result |= check_equipment_flags(creature_ptr, TR_RES_FIRE);
1041- result |= is_immune_fire(creature_ptr);
1041+ result |= has_immune_fire(creature_ptr);
10421042 return result;
10431043 }
10441044
1045-BIT_FLAGS is_vuln_fire(player_type *creature_ptr)
1045+BIT_FLAGS has_vuln_fire(player_type *creature_ptr)
10461046 {
10471047 BIT_FLAGS result = 0L;
10481048 if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
@@ -1059,7 +1059,7 @@ BIT_FLAGS is_vuln_fire(player_type *creature_ptr)
10591059 return result;
10601060 }
10611061
1062-BIT_FLAGS is_resist_cold(player_type *creature_ptr)
1062+BIT_FLAGS has_resist_cold(player_type *creature_ptr)
10631063 {
10641064 BIT_FLAGS result = 0L;
10651065
@@ -1088,11 +1088,11 @@ BIT_FLAGS is_resist_cold(player_type *creature_ptr)
10881088 }
10891089
10901090 result |= check_equipment_flags(creature_ptr, TR_RES_COLD);
1091- result |= is_immune_cold(creature_ptr);
1091+ result |= has_immune_cold(creature_ptr);
10921092 return result;
10931093 }
10941094
1095-BIT_FLAGS is_vuln_cold(player_type *creature_ptr)
1095+BIT_FLAGS has_vuln_cold(player_type *creature_ptr)
10961096 {
10971097 BIT_FLAGS result = 0L;
10981098 if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
@@ -1105,7 +1105,7 @@ BIT_FLAGS is_vuln_cold(player_type *creature_ptr)
11051105 return result;
11061106 }
11071107
1108-BIT_FLAGS is_resist_pois(player_type *creature_ptr)
1108+BIT_FLAGS has_resist_pois(player_type *creature_ptr)
11091109 {
11101110 BIT_FLAGS result = 0L;
11111111
@@ -1138,7 +1138,7 @@ BIT_FLAGS is_resist_pois(player_type *creature_ptr)
11381138 return result;
11391139 }
11401140
1141-BIT_FLAGS is_resist_conf(player_type *creature_ptr)
1141+BIT_FLAGS has_resist_conf(player_type *creature_ptr)
11421142 {
11431143 BIT_FLAGS result = 0L;
11441144
@@ -1169,7 +1169,7 @@ BIT_FLAGS is_resist_conf(player_type *creature_ptr)
11691169 return result;
11701170 }
11711171
1172-BIT_FLAGS is_resist_sound(player_type *creature_ptr)
1172+BIT_FLAGS has_resist_sound(player_type *creature_ptr)
11731173 {
11741174 BIT_FLAGS result = 0L;
11751175
@@ -1193,7 +1193,7 @@ BIT_FLAGS is_resist_sound(player_type *creature_ptr)
11931193 return result;
11941194 }
11951195
1196-BIT_FLAGS is_resist_lite(player_type *creature_ptr)
1196+BIT_FLAGS has_resist_lite(player_type *creature_ptr)
11971197 {
11981198 BIT_FLAGS result = 0L;
11991199
@@ -1213,7 +1213,7 @@ BIT_FLAGS is_resist_lite(player_type *creature_ptr)
12131213 return result;
12141214 }
12151215
1216-BIT_FLAGS is_vuln_lite(player_type *creature_ptr)
1216+BIT_FLAGS has_vuln_lite(player_type *creature_ptr)
12171217 {
12181218 BIT_FLAGS result = 0L;
12191219 if (is_specific_player_race(creature_ptr, RACE_S_FAIRY) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
@@ -1228,7 +1228,7 @@ BIT_FLAGS is_vuln_lite(player_type *creature_ptr)
12281228 return result;
12291229 }
12301230
1231-BIT_FLAGS is_resist_dark(player_type *creature_ptr)
1231+BIT_FLAGS has_resist_dark(player_type *creature_ptr)
12321232 {
12331233 BIT_FLAGS result = 0L;
12341234
@@ -1254,7 +1254,7 @@ BIT_FLAGS is_resist_dark(player_type *creature_ptr)
12541254 return result;
12551255 }
12561256
1257-BIT_FLAGS is_resist_chaos(player_type *creature_ptr)
1257+BIT_FLAGS has_resist_chaos(player_type *creature_ptr)
12581258 {
12591259 BIT_FLAGS result = 0L;
12601260
@@ -1280,7 +1280,7 @@ BIT_FLAGS is_resist_chaos(player_type *creature_ptr)
12801280 return result;
12811281 }
12821282
1283-BIT_FLAGS is_resist_disen(player_type *creature_ptr)
1283+BIT_FLAGS has_resist_disen(player_type *creature_ptr)
12841284 {
12851285 BIT_FLAGS result = 0L;
12861286
@@ -1303,7 +1303,7 @@ BIT_FLAGS is_resist_disen(player_type *creature_ptr)
13031303 return result;
13041304 }
13051305
1306-BIT_FLAGS is_resist_shard(player_type *creature_ptr)
1306+BIT_FLAGS has_resist_shard(player_type *creature_ptr)
13071307 {
13081308 BIT_FLAGS result = 0L;
13091309
@@ -1322,7 +1322,7 @@ BIT_FLAGS is_resist_shard(player_type *creature_ptr)
13221322 return result;
13231323 }
13241324
1325-BIT_FLAGS is_resist_nexus(player_type *creature_ptr)
1325+BIT_FLAGS has_resist_nexus(player_type *creature_ptr)
13261326 {
13271327 BIT_FLAGS result = 0L;
13281328
@@ -1342,7 +1342,7 @@ BIT_FLAGS is_resist_nexus(player_type *creature_ptr)
13421342 return result;
13431343 }
13441344
1345-BIT_FLAGS is_resist_blind(player_type *creature_ptr)
1345+BIT_FLAGS has_resist_blind(player_type *creature_ptr)
13461346 {
13471347 BIT_FLAGS result = 0L;
13481348
@@ -1365,7 +1365,7 @@ BIT_FLAGS is_resist_blind(player_type *creature_ptr)
13651365 return result;
13661366 }
13671367
1368-BIT_FLAGS is_resist_neth(player_type *creature_ptr)
1368+BIT_FLAGS has_resist_neth(player_type *creature_ptr)
13691369 {
13701370 BIT_FLAGS result = 0L;
13711371
@@ -1390,7 +1390,7 @@ BIT_FLAGS is_resist_neth(player_type *creature_ptr)
13901390 return result;
13911391 }
13921392
1393-BIT_FLAGS is_resist_time(player_type *creature_ptr)
1393+BIT_FLAGS has_resist_time(player_type *creature_ptr)
13941394 {
13951395 BIT_FLAGS result = 0L;
13961396
@@ -1402,7 +1402,7 @@ BIT_FLAGS is_resist_time(player_type *creature_ptr)
14021402 return result;
14031403 }
14041404
1405-BIT_FLAGS is_resist_water(player_type *creature_ptr)
1405+BIT_FLAGS has_resist_water(player_type *creature_ptr)
14061406 {
14071407 BIT_FLAGS result = 0L;
14081408
@@ -1413,7 +1413,7 @@ BIT_FLAGS is_resist_water(player_type *creature_ptr)
14131413 return result;
14141414 }
14151415
1416-BIT_FLAGS is_resist_fear(player_type *creature_ptr)
1416+BIT_FLAGS has_resist_fear(player_type *creature_ptr)
14171417 {
14181418 BIT_FLAGS result = 0L;
14191419
@@ -1459,7 +1459,7 @@ BIT_FLAGS is_resist_fear(player_type *creature_ptr)
14591459 return result;
14601460 }
14611461
1462-BIT_FLAGS is_immune_acid(player_type *creature_ptr)
1462+BIT_FLAGS has_immune_acid(player_type *creature_ptr)
14631463 {
14641464 BIT_FLAGS result = 0L;
14651465 if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_YEEK && creature_ptr->lev > 19)
@@ -1474,7 +1474,7 @@ BIT_FLAGS is_immune_acid(player_type *creature_ptr)
14741474 return result;
14751475 }
14761476
1477-BIT_FLAGS is_immune_elec(player_type *creature_ptr)
1477+BIT_FLAGS has_immune_elec(player_type *creature_ptr)
14781478 {
14791479 BIT_FLAGS result = 0L;
14801480
@@ -1487,7 +1487,7 @@ BIT_FLAGS is_immune_elec(player_type *creature_ptr)
14871487 return result;
14881488 }
14891489
1490-BIT_FLAGS is_immune_fire(player_type *creature_ptr)
1490+BIT_FLAGS has_immune_fire(player_type *creature_ptr)
14911491 {
14921492 BIT_FLAGS result = 0L;
14931493
@@ -1500,7 +1500,7 @@ BIT_FLAGS is_immune_fire(player_type *creature_ptr)
15001500 return result;
15011501 }
15021502
1503-BIT_FLAGS is_immune_cold(player_type *creature_ptr)
1503+BIT_FLAGS has_immune_cold(player_type *creature_ptr)
15041504 {
15051505 BIT_FLAGS result = 0L;
15061506
@@ -1513,7 +1513,7 @@ BIT_FLAGS is_immune_cold(player_type *creature_ptr)
15131513 return result;
15141514 }
15151515
1516-BIT_FLAGS is_immune_dark(player_type *creature_ptr)
1516+BIT_FLAGS has_immune_dark(player_type *creature_ptr)
15171517 {
15181518 BIT_FLAGS result = 0L;
15191519
@@ -1594,7 +1594,7 @@ BIT_FLAGS has_lite(player_type *creature_ptr)
15941594 return result;
15951595 }
15961596
1597-bool is_disable_two_handed_bonus(player_type *creature_ptr, int i)
1597+bool has_disable_two_handed_bonus(player_type *creature_ptr, int i)
15981598 {
15991599 object_type *o_ptr;
16001600 o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i];
@@ -1606,7 +1606,7 @@ bool is_disable_two_handed_bonus(player_type *creature_ptr, int i)
16061606 return FALSE;
16071607 }
16081608
1609-bool is_icky_wield_weapon(player_type *creature_ptr, int i)
1609+bool has_icky_wield_weapon(player_type *creature_ptr, int i)
16101610 {
16111611 object_type *o_ptr;
16121612 BIT_FLAGS flgs[TR_FLAG_SIZE];
@@ -1620,13 +1620,13 @@ bool is_icky_wield_weapon(player_type *creature_ptr, int i)
16201620 return TRUE;
16211621 }
16221622 }
1623- if (is_not_monk_weapon(creature_ptr, i) || is_not_ninja_weapon(creature_ptr, i)) {
1623+ if (has_not_monk_weapon(creature_ptr, i) || has_not_ninja_weapon(creature_ptr, i)) {
16241624 return TRUE;
16251625 }
16261626 return FALSE;
16271627 }
16281628
1629-bool is_riding_wield_weapon(player_type *creature_ptr, int i)
1629+bool has_riding_wield_weapon(player_type *creature_ptr, int i)
16301630 {
16311631 object_type *o_ptr;
16321632 BIT_FLAGS flgs[TR_FLAG_SIZE];
@@ -1639,7 +1639,7 @@ bool is_riding_wield_weapon(player_type *creature_ptr, int i)
16391639 return FALSE;
16401640 }
16411641
1642-bool is_not_ninja_weapon(player_type *creature_ptr, int i)
1642+bool has_not_ninja_weapon(player_type *creature_ptr, int i)
16431643 {
16441644 tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN;
16451645 OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
@@ -1647,7 +1647,7 @@ bool is_not_ninja_weapon(player_type *creature_ptr, int i)
16471647 && !((s_info[CLASS_NINJA].w_max[tval][sval] > WEAPON_EXP_BEGINNER) && (creature_ptr->inventory_list[INVEN_LARM - i].tval != TV_SHIELD));
16481648 }
16491649
1650-bool is_not_monk_weapon(player_type *creature_ptr, int i)
1650+bool has_not_monk_weapon(player_type *creature_ptr, int i)
16511651 {
16521652 tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN;
16531653 OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -22,22 +22,22 @@ enum flag_cause {
2222 FLAG_CAUSE_MAX = 18
2323 };
2424
25-bool is_pass_wall(player_type *creature_ptr);
26-bool is_kill_wall(player_type *creature_ptr);
27-BIT_FLAGS is_xtra_might(player_type *creature_ptr);
28-BIT_FLAGS is_esp_evil(player_type *creature_ptr);
29-BIT_FLAGS is_esp_animal(player_type *creature_ptr);
30-BIT_FLAGS is_esp_undead(player_type *creature_ptr);
31-BIT_FLAGS is_esp_demon(player_type *creature_ptr);
32-BIT_FLAGS is_esp_orc(player_type *creature_ptr);
33-BIT_FLAGS is_esp_troll(player_type *creature_ptr);
34-BIT_FLAGS is_esp_giant(player_type *creature_ptr);
35-BIT_FLAGS is_esp_dragon(player_type *creature_ptr);
36-BIT_FLAGS is_esp_human(player_type *creature_ptr);
37-BIT_FLAGS is_esp_good(player_type *creature_ptr);
38-BIT_FLAGS is_esp_nonliving(player_type *creature_ptr);
39-BIT_FLAGS is_esp_unique(player_type *creature_ptr);
40-BIT_FLAGS is_esp_telepathy(player_type *creature_ptr);
25+bool has_pass_wall(player_type *creature_ptr);
26+bool has_kill_wall(player_type *creature_ptr);
27+BIT_FLAGS has_xtra_might(player_type *creature_ptr);
28+BIT_FLAGS has_esp_evil(player_type *creature_ptr);
29+BIT_FLAGS has_esp_animal(player_type *creature_ptr);
30+BIT_FLAGS has_esp_undead(player_type *creature_ptr);
31+BIT_FLAGS has_esp_demon(player_type *creature_ptr);
32+BIT_FLAGS has_esp_orc(player_type *creature_ptr);
33+BIT_FLAGS has_esp_troll(player_type *creature_ptr);
34+BIT_FLAGS has_esp_giant(player_type *creature_ptr);
35+BIT_FLAGS has_esp_dragon(player_type *creature_ptr);
36+BIT_FLAGS has_esp_human(player_type *creature_ptr);
37+BIT_FLAGS has_esp_good(player_type *creature_ptr);
38+BIT_FLAGS has_esp_nonliving(player_type *creature_ptr);
39+BIT_FLAGS has_esp_unique(player_type *creature_ptr);
40+BIT_FLAGS has_esp_telepathy(player_type *creature_ptr);
4141 BIT_FLAGS has_bless_blade(player_type *creature_ptr);
4242 BIT_FLAGS has_easy2_weapon(player_type *creature_ptr);
4343 BIT_FLAGS has_down_saving(player_type *creature_ptr);
@@ -60,12 +60,12 @@ BIT_FLAGS has_hold_exp(player_type *creature_ptr);
6060 BIT_FLAGS has_see_inv(player_type *creature_ptr);
6161 BIT_FLAGS has_magic_mastery(player_type *creature_ptr);
6262 BIT_FLAGS has_free_act(player_type *creature_ptr);
63-BIT_FLAGS is_sustain_str(player_type *creature_ptr);
64-BIT_FLAGS is_sustain_int(player_type *creature_ptr);
65-BIT_FLAGS is_sustain_wis(player_type *creature_ptr);
66-BIT_FLAGS is_sustain_dex(player_type *creature_ptr);
67-BIT_FLAGS is_sustain_con(player_type *creature_ptr);
68-BIT_FLAGS is_sustain_chr(player_type *creature_ptr);
63+BIT_FLAGS has_sustain_str(player_type *creature_ptr);
64+BIT_FLAGS has_sustain_int(player_type *creature_ptr);
65+BIT_FLAGS has_sustain_wis(player_type *creature_ptr);
66+BIT_FLAGS has_sustain_dex(player_type *creature_ptr);
67+BIT_FLAGS has_sustain_con(player_type *creature_ptr);
68+BIT_FLAGS has_sustain_chr(player_type *creature_ptr);
6969 BIT_FLAGS has_levitation(player_type *creature_ptr);
7070 void has_can_swim(player_type *creature_ptr);
7171 BIT_FLAGS has_slow_digest(player_type *creature_ptr);
@@ -73,41 +73,41 @@ BIT_FLAGS has_regenerate(player_type *creature_ptr);
7373 void has_curses(player_type *creature_ptr);
7474 BIT_FLAGS has_impact(player_type *creature_ptr);
7575 void has_extra_blow(player_type *creature_ptr);
76-BIT_FLAGS is_resist_acid(player_type *creature_ptr);
77-BIT_FLAGS is_vuln_acid(player_type *creature_ptr);
78-BIT_FLAGS is_resist_elec(player_type *creature_ptr);
79-BIT_FLAGS is_vuln_elec(player_type *creature_ptr);
80-BIT_FLAGS is_resist_fire(player_type *creature_ptr);
81-BIT_FLAGS is_vuln_fire(player_type *creature_ptr);
82-BIT_FLAGS is_resist_cold(player_type *creature_ptr);
83-BIT_FLAGS is_vuln_cold(player_type *creature_ptr);
84-BIT_FLAGS is_resist_pois(player_type *creature_ptr);
85-BIT_FLAGS is_resist_conf(player_type *creature_ptr);
86-BIT_FLAGS is_resist_sound(player_type *creature_ptr);
87-BIT_FLAGS is_resist_lite(player_type *creature_ptr);
88-BIT_FLAGS is_vuln_lite(player_type *creature_ptr);
89-BIT_FLAGS is_resist_dark(player_type *creature_ptr);
90-BIT_FLAGS is_resist_chaos(player_type *creature_ptr);
91-BIT_FLAGS is_resist_disen(player_type *creature_ptr);
92-BIT_FLAGS is_resist_shard(player_type *creature_ptr);
93-BIT_FLAGS is_resist_nexus(player_type *creature_ptr);
94-BIT_FLAGS is_resist_blind(player_type *creature_ptr);
95-BIT_FLAGS is_resist_neth(player_type *creature_ptr);
96-BIT_FLAGS is_resist_time(player_type *creature_ptr);
97-BIT_FLAGS is_resist_water(player_type *creature_ptr);
98-BIT_FLAGS is_resist_fear(player_type *creature_ptr);
99-BIT_FLAGS is_immune_acid(player_type *creature_ptr);
100-BIT_FLAGS is_immune_elec(player_type *creature_ptr);
101-BIT_FLAGS is_immune_fire(player_type *creature_ptr);
102-BIT_FLAGS is_immune_cold(player_type *creature_ptr);
103-BIT_FLAGS is_immune_dark(player_type *creature_ptr);
76+BIT_FLAGS has_resist_acid(player_type *creature_ptr);
77+BIT_FLAGS has_vuln_acid(player_type *creature_ptr);
78+BIT_FLAGS has_resist_elec(player_type *creature_ptr);
79+BIT_FLAGS has_vuln_elec(player_type *creature_ptr);
80+BIT_FLAGS has_resist_fire(player_type *creature_ptr);
81+BIT_FLAGS has_vuln_fire(player_type *creature_ptr);
82+BIT_FLAGS has_resist_cold(player_type *creature_ptr);
83+BIT_FLAGS has_vuln_cold(player_type *creature_ptr);
84+BIT_FLAGS has_resist_pois(player_type *creature_ptr);
85+BIT_FLAGS has_resist_conf(player_type *creature_ptr);
86+BIT_FLAGS has_resist_sound(player_type *creature_ptr);
87+BIT_FLAGS has_resist_lite(player_type *creature_ptr);
88+BIT_FLAGS has_vuln_lite(player_type *creature_ptr);
89+BIT_FLAGS has_resist_dark(player_type *creature_ptr);
90+BIT_FLAGS has_resist_chaos(player_type *creature_ptr);
91+BIT_FLAGS has_resist_disen(player_type *creature_ptr);
92+BIT_FLAGS has_resist_shard(player_type *creature_ptr);
93+BIT_FLAGS has_resist_nexus(player_type *creature_ptr);
94+BIT_FLAGS has_resist_blind(player_type *creature_ptr);
95+BIT_FLAGS has_resist_neth(player_type *creature_ptr);
96+BIT_FLAGS has_resist_time(player_type *creature_ptr);
97+BIT_FLAGS has_resist_water(player_type *creature_ptr);
98+BIT_FLAGS has_resist_fear(player_type *creature_ptr);
99+BIT_FLAGS has_immune_acid(player_type *creature_ptr);
100+BIT_FLAGS has_immune_elec(player_type *creature_ptr);
101+BIT_FLAGS has_immune_fire(player_type *creature_ptr);
102+BIT_FLAGS has_immune_cold(player_type *creature_ptr);
103+BIT_FLAGS has_immune_dark(player_type *creature_ptr);
104104 bool has_right_hand_weapon(player_type *creature_ptr);
105105 bool has_left_hand_weapon(player_type *creature_ptr);
106106 bool has_two_handed_weapons(player_type *creature_ptr);
107107 BIT_FLAGS has_lite(player_type *creature_ptr);
108-bool is_disable_two_handed_bonus(player_type *creature_ptr, int i);
109-bool is_not_ninja_weapon(player_type *creature_ptr, int i);
110-bool is_not_monk_weapon(player_type *creature_ptr, int i);
111-bool is_icky_wield_weapon(player_type *creature_ptr, int i);
112-bool is_riding_wield_weapon(player_type *creature_ptr, int i);
108+bool has_disable_two_handed_bonus(player_type *creature_ptr, int i);
109+bool has_not_ninja_weapon(player_type *creature_ptr, int i);
110+bool has_not_monk_weapon(player_type *creature_ptr, int i);
111+bool has_icky_wield_weapon(player_type *creature_ptr, int i);
112+bool has_riding_wield_weapon(player_type *creature_ptr, int i);
113113 bool has_good_luck(player_type *creature_ptr);
--- a/src/player/player-status-resist.c
+++ b/src/player/player-status-resist.c
@@ -65,11 +65,11 @@ PERCENTAGE calc_acid_damage_rate(player_type *creature_ptr)
6565 PERCENTAGE per = 100;
6666 int i;
6767
68- if (is_immune_acid(creature_ptr)) {
68+ if (has_immune_acid(creature_ptr)) {
6969 return 0;
7070 }
7171
72- BIT_FLAGS flgs = is_vuln_acid(creature_ptr);
72+ BIT_FLAGS flgs = has_vuln_acid(creature_ptr);
7373 for (i = 0; i < FLAG_CAUSE_MAX; i++) {
7474 if (flgs & (0x01 << i)) {
7575 if (i == FLAG_CAUSE_MUTATION) {
@@ -96,11 +96,11 @@ PERCENTAGE calc_elec_damage_rate(player_type *creature_ptr)
9696 PERCENTAGE per = 100;
9797 int i;
9898
99- if (is_immune_elec(creature_ptr)) {
99+ if (has_immune_elec(creature_ptr)) {
100100 return 0;
101101 }
102102
103- BIT_FLAGS flgs = is_vuln_elec(creature_ptr);
103+ BIT_FLAGS flgs = has_vuln_elec(creature_ptr);
104104 for (i = 0; i < FLAG_CAUSE_MAX; i++) {
105105 if (flgs & (0x01 << i)) {
106106 if (i == FLAG_CAUSE_MUTATION) {
@@ -126,7 +126,7 @@ PERCENTAGE calc_fire_damage_rate(player_type *creature_ptr)
126126 {
127127 PERCENTAGE per = 100;
128128 int i;
129- BIT_FLAGS flgs = is_vuln_fire(creature_ptr);
129+ BIT_FLAGS flgs = has_vuln_fire(creature_ptr);
130130 for (i = 0; i < FLAG_CAUSE_MAX; i++) {
131131 if (flgs & (0x01 << i)) {
132132 if (i == FLAG_CAUSE_MUTATION) {
@@ -153,7 +153,7 @@ PERCENTAGE calc_cold_damage_rate(player_type *creature_ptr)
153153 {
154154 PERCENTAGE per = 100;
155155 int i;
156- BIT_FLAGS flgs = is_vuln_cold(creature_ptr);
156+ BIT_FLAGS flgs = has_vuln_cold(creature_ptr);
157157 for (i = 0; i < FLAG_CAUSE_MAX; i++) {
158158 if (flgs & (0x01 << i)) {
159159 if (i == FLAG_CAUSE_MUTATION) {
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -319,22 +319,22 @@ void calc_bonuses(player_type *creature_ptr)
319319 ARMOUR_CLASS old_dis_ac = creature_ptr->dis_ac;
320320 ARMOUR_CLASS old_dis_to_a = creature_ptr->dis_to_a;
321321
322- creature_ptr->pass_wall = is_pass_wall(creature_ptr);
323- creature_ptr->kill_wall = is_kill_wall(creature_ptr);
324- creature_ptr->xtra_might = is_xtra_might(creature_ptr);
325- creature_ptr->esp_evil = is_esp_evil(creature_ptr);
326- creature_ptr->esp_animal = is_esp_animal(creature_ptr);
327- creature_ptr->esp_undead = is_esp_undead(creature_ptr);
328- creature_ptr->esp_demon = is_esp_demon(creature_ptr);
329- creature_ptr->esp_orc = is_esp_orc(creature_ptr);
330- creature_ptr->esp_troll = is_esp_troll(creature_ptr);
331- creature_ptr->esp_giant = is_esp_giant(creature_ptr);
332- creature_ptr->esp_dragon = is_esp_dragon(creature_ptr);
333- creature_ptr->esp_human = is_esp_human(creature_ptr);
334- creature_ptr->esp_good = is_esp_good(creature_ptr);
335- creature_ptr->esp_nonliving = is_esp_nonliving(creature_ptr);
336- creature_ptr->esp_unique = is_esp_unique(creature_ptr);
337- creature_ptr->telepathy = is_esp_telepathy(creature_ptr);
322+ creature_ptr->pass_wall = has_pass_wall(creature_ptr);
323+ creature_ptr->kill_wall = has_kill_wall(creature_ptr);
324+ creature_ptr->xtra_might = has_xtra_might(creature_ptr);
325+ creature_ptr->esp_evil = has_esp_evil(creature_ptr);
326+ creature_ptr->esp_animal = has_esp_animal(creature_ptr);
327+ creature_ptr->esp_undead = has_esp_undead(creature_ptr);
328+ creature_ptr->esp_demon = has_esp_demon(creature_ptr);
329+ creature_ptr->esp_orc = has_esp_orc(creature_ptr);
330+ creature_ptr->esp_troll = has_esp_troll(creature_ptr);
331+ creature_ptr->esp_giant = has_esp_giant(creature_ptr);
332+ creature_ptr->esp_dragon = has_esp_dragon(creature_ptr);
333+ creature_ptr->esp_human = has_esp_human(creature_ptr);
334+ creature_ptr->esp_good = has_esp_good(creature_ptr);
335+ creature_ptr->esp_nonliving = has_esp_nonliving(creature_ptr);
336+ creature_ptr->esp_unique = has_esp_unique(creature_ptr);
337+ creature_ptr->telepathy = has_esp_telepathy(creature_ptr);
338338 creature_ptr->bless_blade = has_bless_blade(creature_ptr);
339339 creature_ptr->easy_2weapon = has_easy2_weapon(creature_ptr);
340340 creature_ptr->down_saving = has_down_saving(creature_ptr);
@@ -354,12 +354,12 @@ void calc_bonuses(player_type *creature_ptr)
354354 creature_ptr->hold_exp = has_hold_exp(creature_ptr);
355355 creature_ptr->see_inv = has_see_inv(creature_ptr);
356356 creature_ptr->free_act = has_free_act(creature_ptr);
357- creature_ptr->sustain_str = is_sustain_str(creature_ptr);
358- creature_ptr->sustain_int = is_sustain_int(creature_ptr);
359- creature_ptr->sustain_wis = is_sustain_wis(creature_ptr);
360- creature_ptr->sustain_dex = is_sustain_dex(creature_ptr);
361- creature_ptr->sustain_con = is_sustain_con(creature_ptr);
362- creature_ptr->sustain_chr = is_sustain_chr(creature_ptr);
357+ creature_ptr->sustain_str = has_sustain_str(creature_ptr);
358+ creature_ptr->sustain_int = has_sustain_int(creature_ptr);
359+ creature_ptr->sustain_wis = has_sustain_wis(creature_ptr);
360+ creature_ptr->sustain_dex = has_sustain_dex(creature_ptr);
361+ creature_ptr->sustain_con = has_sustain_con(creature_ptr);
362+ creature_ptr->sustain_chr = has_sustain_chr(creature_ptr);
363363 creature_ptr->levitation = has_levitation(creature_ptr);
364364 has_can_swim(creature_ptr);
365365 creature_ptr->slow_digest = has_slow_digest(creature_ptr);
@@ -367,25 +367,25 @@ void calc_bonuses(player_type *creature_ptr)
367367 has_curses(creature_ptr);
368368 creature_ptr->impact = has_impact(creature_ptr);
369369 has_extra_blow(creature_ptr);
370- creature_ptr->resist_acid = is_resist_acid(creature_ptr);
371- creature_ptr->resist_elec = is_resist_elec(creature_ptr);
372- creature_ptr->resist_fire = is_resist_fire(creature_ptr);
373- creature_ptr->resist_cold = is_resist_cold(creature_ptr);
374- creature_ptr->resist_pois = is_resist_pois(creature_ptr);
375- creature_ptr->resist_conf = is_resist_conf(creature_ptr);
376- creature_ptr->resist_sound = is_resist_sound(creature_ptr);
377- creature_ptr->resist_lite = is_resist_lite(creature_ptr);
378- creature_ptr->resist_dark = is_resist_dark(creature_ptr);
379- creature_ptr->resist_chaos = is_resist_chaos(creature_ptr);
380- creature_ptr->resist_disen = is_resist_disen(creature_ptr);
381- creature_ptr->resist_shard = is_resist_shard(creature_ptr);
382- creature_ptr->resist_nexus = is_resist_nexus(creature_ptr);
383- creature_ptr->resist_blind = is_resist_blind(creature_ptr);
384- creature_ptr->resist_neth = is_resist_neth(creature_ptr);
385- creature_ptr->resist_time = is_resist_time(creature_ptr);
386- creature_ptr->resist_fear = is_resist_fear(creature_ptr);
387- creature_ptr->resist_time = is_resist_time(creature_ptr);
388- creature_ptr->resist_water = is_resist_water(creature_ptr);
370+ creature_ptr->resist_acid = has_resist_acid(creature_ptr);
371+ creature_ptr->resist_elec = has_resist_elec(creature_ptr);
372+ creature_ptr->resist_fire = has_resist_fire(creature_ptr);
373+ creature_ptr->resist_cold = has_resist_cold(creature_ptr);
374+ creature_ptr->resist_pois = has_resist_pois(creature_ptr);
375+ creature_ptr->resist_conf = has_resist_conf(creature_ptr);
376+ creature_ptr->resist_sound = has_resist_sound(creature_ptr);
377+ creature_ptr->resist_lite = has_resist_lite(creature_ptr);
378+ creature_ptr->resist_dark = has_resist_dark(creature_ptr);
379+ creature_ptr->resist_chaos = has_resist_chaos(creature_ptr);
380+ creature_ptr->resist_disen = has_resist_disen(creature_ptr);
381+ creature_ptr->resist_shard = has_resist_shard(creature_ptr);
382+ creature_ptr->resist_nexus = has_resist_nexus(creature_ptr);
383+ creature_ptr->resist_blind = has_resist_blind(creature_ptr);
384+ creature_ptr->resist_neth = has_resist_neth(creature_ptr);
385+ creature_ptr->resist_time = has_resist_time(creature_ptr);
386+ creature_ptr->resist_fear = has_resist_fear(creature_ptr);
387+ creature_ptr->resist_time = has_resist_time(creature_ptr);
388+ creature_ptr->resist_water = has_resist_water(creature_ptr);
389389
390390 creature_ptr->lite = has_lite(creature_ptr);
391391
@@ -428,8 +428,8 @@ void calc_bonuses(player_type *creature_ptr)
428428 }
429429
430430 for (int i = 0; i < 2; i++) {
431- creature_ptr->icky_wield[i] = is_icky_wield_weapon(creature_ptr, i);
432- creature_ptr->riding_wield[i] = is_riding_wield_weapon(creature_ptr, i);
431+ creature_ptr->icky_wield[i] = has_icky_wield_weapon(creature_ptr, i);
432+ creature_ptr->riding_wield[i] = has_riding_wield_weapon(creature_ptr, i);
433433 creature_ptr->num_blow[i] = calc_num_blow(creature_ptr, i);
434434 creature_ptr->to_dd[i] = calc_to_weapon_dice_num(creature_ptr, INVEN_RARM + i);
435435 creature_ptr->to_ds[i] = calc_to_weapon_dice_side(creature_ptr, INVEN_RARM + i);
@@ -1701,7 +1701,7 @@ static s16b calc_num_blow(player_type *creature_ptr, int i)
17011701 div = ((o_ptr->weight < wgt) ? wgt : o_ptr->weight);
17021702 str_index = (adj_str_blow[creature_ptr->stat_ind[A_STR]] * mul / div);
17031703
1704- if (has_two_handed_weapons(creature_ptr) && !is_disable_two_handed_bonus(creature_ptr, 0))
1704+ if (has_two_handed_weapons(creature_ptr) && !has_disable_two_handed_bonus(creature_ptr, 0))
17051705 str_index++;
17061706 if (creature_ptr->pclass == CLASS_NINJA)
17071707 str_index = MAX(0, str_index - 1);
@@ -1797,7 +1797,7 @@ static s16b calc_num_blow(player_type *creature_ptr, int i)
17971797 num_blow += 1 + creature_ptr->extra_blows[0];
17981798 }
17991799
1800- if (is_not_ninja_weapon(creature_ptr, i)) {
1800+ if (has_not_ninja_weapon(creature_ptr, i)) {
18011801 num_blow /= 2;
18021802 if (num_blow < 1)
18031803 num_blow = 1;
@@ -2996,7 +2996,7 @@ static s16b calc_to_damage(player_type *creature_ptr, INVENTORY_IDX slot, bool i
29962996
29972997 if (get_default_hand(creature_ptr) == id) {
29982998 if ((is_martial_arts_mode(creature_ptr) && empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM))
2999- || !is_disable_two_handed_bonus(creature_ptr, 0)) {
2999+ || !has_disable_two_handed_bonus(creature_ptr, 0)) {
30003000 int bonus_to_d = 0;
30013001 bonus_to_d = ((int)(adj_str_td[creature_ptr->stat_ind[A_STR]]) - 128) / 2;
30023002 damage += MAX(bonus_to_d, 1);
@@ -3107,7 +3107,7 @@ static s16b calc_to_hit(player_type *creature_ptr, INVENTORY_IDX slot, bool is_t
31073107
31083108 hit += (creature_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
31093109
3110- if (is_not_ninja_weapon(creature_ptr, id) || is_not_monk_weapon(creature_ptr, id)) {
3110+ if (has_not_ninja_weapon(creature_ptr, id) || has_not_monk_weapon(creature_ptr, id)) {
31113111 hit -= 40;
31123112 }
31133113
@@ -3118,7 +3118,7 @@ static s16b calc_to_hit(player_type *creature_ptr, INVENTORY_IDX slot, bool is_t
31183118 }
31193119
31203120 if ((is_martial_arts_mode(creature_ptr) && empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM))
3121- || !is_disable_two_handed_bonus(creature_ptr, 0)) {
3121+ || !has_disable_two_handed_bonus(creature_ptr, 0)) {
31223122 int bonus_to_h = 0;
31233123 bonus_to_h = ((int)(adj_str_th[creature_ptr->stat_ind[A_STR]]) - 128) + ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128);
31243124 hit += MAX(bonus_to_h, 1);
--- a/src/specific-object/death-scythe.c
+++ b/src/specific-object/death-scythe.c
@@ -87,16 +87,16 @@ static void compensate_death_scythe_reflection_magnification(player_type *attack
8787 if ((attacker_ptr->align < 0) && (*magnification < 20))
8888 *magnification = 20;
8989
90- if (!(attacker_ptr->resist_acid || is_oppose_acid(attacker_ptr) || is_immune_acid(attacker_ptr)) && (*magnification < 25))
90+ if (!(attacker_ptr->resist_acid || is_oppose_acid(attacker_ptr) || has_immune_acid(attacker_ptr)) && (*magnification < 25))
9191 *magnification = 25;
9292
93- if (!(attacker_ptr->resist_elec || is_oppose_elec(attacker_ptr) || is_immune_elec(attacker_ptr)) && (*magnification < 25))
93+ if (!(attacker_ptr->resist_elec || is_oppose_elec(attacker_ptr) || has_immune_elec(attacker_ptr)) && (*magnification < 25))
9494 *magnification = 25;
9595
96- if (!(attacker_ptr->resist_fire || is_oppose_fire(attacker_ptr) || is_immune_fire(attacker_ptr)) && (*magnification < 25))
96+ if (!(attacker_ptr->resist_fire || is_oppose_fire(attacker_ptr) || has_immune_fire(attacker_ptr)) && (*magnification < 25))
9797 *magnification = 25;
9898
99- if (!(attacker_ptr->resist_cold || is_oppose_cold(attacker_ptr) || is_immune_cold(attacker_ptr)) && (*magnification < 25))
99+ if (!(attacker_ptr->resist_cold || is_oppose_cold(attacker_ptr) || has_immune_cold(attacker_ptr)) && (*magnification < 25))
100100 *magnification = 25;
101101
102102 if (!(attacker_ptr->resist_pois || is_oppose_pois(attacker_ptr)) && (*magnification < 25))
旧リポジトリブラウザで表示