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

Pets considered any noise made by hero as whistling

Browse Source 
In 3.6.2 parts of the wakeup code were merged together, and this
caused pets consider any noise made by the hero - such as hitting
iron bars or digging - as whistling for them to come to the hero.

Change it to only consider actual whistling and ringing a bell.
This commit is contained in:
Pasi Kallinen
2024-04-03 12:42:38 +03:00
parent 6aaab97044
commit defb5d5f80
10 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mon.c
View File

@@ -24,6 +24,7 @@ staticfn void logdeadmon(struct monst *, int);
staticfn boolean ok_to_obliterate(struct monst *);
staticfn void qst_guardians_respond(void);
staticfn void peacefuls_respond(struct monst *);
staticfn void wake_nearto_core(coordxy, coordxy, int, boolean);
staticfn void m_restartcham(struct monst *);
staticfn boolean restrap(struct monst *);
staticfn int pick_animal(void);
@@ -4011,14 +4012,14 @@ wakeup(struct monst *mtmp, boolean via_attack)
/* Wake up nearby monsters without angering them. */
void
wake_nearby(void)
wake_nearby(boolean petcall)
{
wake_nearto(u.ux, u.uy, u.ulevel * 20);
wake_nearto_core(u.ux, u.uy, u.ulevel * 20, petcall);
}
/* Wake up monsters near some particular location. */
void
wake_nearto(coordxy x, coordxy y, int distance)
staticfn void
wake_nearto_core(coordxy x, coordxy y, int distance, boolean petcall)
{
struct monst *mtmp;
@@ -4032,7 +4033,7 @@ wake_nearto(coordxy x, coordxy y, int distance)
mtmp->msleeping = 0; /* wake indeterminate sleep */
if (!(mtmp->data->geno & G_UNIQ))
mtmp->mstrategy &= ~STRAT_WAITMASK; /* wake 'meditation' */
if (gc.context.mon_moving)
if (gc.context.mon_moving || !petcall)
continue;
if (mtmp->mtame) {
if (!mtmp->isminion)
@@ -4045,6 +4046,12 @@ wake_nearto(coordxy x, coordxy y, int distance)
disturb_buried_zombies(x, y);
}
void
wake_nearto(coordxy x, coordxy y, int distance)
{
wake_nearto_core(x, y, distance, FALSE);
}
/* NOTE: we must check for mimicry before calling this routine */
void
seemimic(struct monst *mtmp)