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

Another tamedog message

Browse Source 
Give a different message when a peaceful creature was tamed.
Allow suppressing this and the previous message, when the caller
handles messaging.
This commit is contained in:
Pasi Kallinen
2024-03-24 10:48:26 +02:00
parent 71c78449e5
commit f131942dd2
13 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/read.c
View File

@@ -1037,7 +1037,7 @@ maybe_tame(struct monst *mtmp, struct obj *sobj)
/* for a shopkeeper, tamedog() will call make_happy_shk() but
not tame the target, so call it even if taming gets resisted */
if (!resist(mtmp, sobj->oclass, 0, NOTELL) || mtmp->isshk)
(void) tamedog(mtmp, (struct obj *) 0);
(void) tamedog(mtmp, (struct obj *) 0, FALSE);
if ((!was_peaceful && mtmp->mpeaceful) || (!was_tame && mtmp->mtame))
return 1;
}
@@ -3194,7 +3194,7 @@ create_particular_creation(
}
mx = mtmp->mx, my = mtmp->my;
if (d->maketame) {
(void) tamedog(mtmp, (struct obj *) 0);
(void) tamedog(mtmp, (struct obj *) 0, FALSE);
} else if (d->makepeaceful || d->makehostile) {
mtmp->mtame = 0; /* sanity precaution */
mtmp->mpeaceful = d->makepeaceful ? 1 : 0;