nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

change is_safepet macro name

Browse Source 
Leaving the word "pet" in the macro name, when it applied to non-pets
seemed too contradictory, even for NetHack.
This commit is contained in:
nhmall
2020-05-03 21:52:41 -04:00
parent aa5eb5a355
commit e440e9569d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/display.h
View File

@@ -134,12 +134,12 @@ enum explosion_types {
&& distu(mon->mx, mon->my) <= (BOLT_LIM * BOLT_LIM)))) && distu(mon->mx, mon->my) <= (BOLT_LIM * BOLT_LIM))))
/* /*
* is_safepet(mon) * is_safemon(mon)
* *
* A special case check used in attack() and domove(). Placing the * A special case check used in attack() and domove(). Placing the
* definition here is convenient. No longer limited to pets. * definition here is convenient. No longer limited to pets.
*/ */
#define is_safepet(mon) \ #define is_safemon(mon) \
(flags.safe_dog && (mon) && (mon)->mpeaceful && canspotmon(mon) \ (flags.safe_dog && (mon) && (mon)->mpeaceful && canspotmon(mon) \
&& !Confusion && !Hallucination && !Stunned) && !Confusion && !Hallucination && !Stunned)

8
src/hack.c
View File

@@ -1584,7 +1584,7 @@ domove_core()
} }
mtmp = m_at(x, y); mtmp = m_at(x, y);
if (mtmp && !is_safepet(mtmp)) { if (mtmp && !is_safemon(mtmp)) {
/* Don't attack if you're running, and can see it */ /* Don't attack if you're running, and can see it */
/* It's fine to displace pets, though */ /* It's fine to displace pets, though */
/* We should never get here if forcefight */ /* We should never get here if forcefight */
@@ -1611,7 +1611,7 @@ domove_core()
/* don't stop travel when displacing pets; if the /* don't stop travel when displacing pets; if the
displace fails for some reason, attack() in uhitm.c displace fails for some reason, attack() in uhitm.c
will stop travel rather than domove */ will stop travel rather than domove */
if (!is_safepet(mtmp) || g.context.forcefight) if (!is_safemon(mtmp) || g.context.forcefight)
nomul(0); nomul(0);
/* only attack if we know it's there */ /* only attack if we know it's there */
/* or if we used the 'F' command to fight blindly */ /* or if we used the 'F' command to fight blindly */
@@ -1642,7 +1642,7 @@ domove_core()
} }
if (g.context.forcefight || !mtmp->mundetected || sensemon(mtmp) if (g.context.forcefight || !mtmp->mundetected || sensemon(mtmp)
|| ((hides_under(mtmp->data) || mtmp->data->mlet == S_EEL) || ((hides_under(mtmp->data) || mtmp->data->mlet == S_EEL)
&& !is_safepet(mtmp))) { && !is_safemon(mtmp))) {
/* target monster might decide to switch places with you... */ /* target monster might decide to switch places with you... */
if (mtmp->data == &mons[PM_DISPLACER_BEAST] && !rn2(2) if (mtmp->data == &mons[PM_DISPLACER_BEAST] && !rn2(2)
@@ -1830,7 +1830,7 @@ domove_core()
* Ceiling-hiding pets are skipped by this section of code, to * Ceiling-hiding pets are skipped by this section of code, to
* be caught by the normal falling-monster code. * be caught by the normal falling-monster code.
*/ */
} else if (is_safepet(mtmp) } else if (is_safemon(mtmp)
&& !(is_hider(mtmp->data) && mtmp->mundetected)) { && !(is_hider(mtmp->data) && mtmp->mundetected)) {
/* if it turns out we can't actually move */ /* if it turns out we can't actually move */
boolean didnt_move = FALSE; boolean didnt_move = FALSE;

2
src/uhitm.c
View File

@@ -336,7 +336,7 @@ register struct monst *mtmp;
* you'll usually just swap places if this is a movement command * you'll usually just swap places if this is a movement command
*/ */
/* Intelligent chaotic weapons (Stormbringer) want blood */ /* Intelligent chaotic weapons (Stormbringer) want blood */
if (is_safepet(mtmp) && !g.context.forcefight) { if (is_safemon(mtmp) && !g.context.forcefight) {
if (!uwep || uwep->oartifact != ART_STORMBRINGER) { if (!uwep || uwep->oartifact != ART_STORMBRINGER) {
/* There are some additional considerations: this won't work /* There are some additional considerations: this won't work
* if in a shop or Punished or you miss a random roll or * if in a shop or Punished or you miss a random roll or