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

Unify guards yelling

Browse Source
This commit is contained in:
Pasi Kallinen
2015-04-27 21:31:25 +03:00
parent f0699b76d9
commit 0903df974f
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dokick.c
View File

@@ -1201,11 +1201,7 @@ dumb:
if (is_watch(mtmp->data) &&
couldsee(mtmp->mx, mtmp->my) &&
mtmp->mpeaceful) {
if (canspotmon(mtmp))
pline("%s yells:", Amonnam(mtmp));
else
You_hear("someone yell:");
verbalize("Halt, thief! You're under arrest!");
mon_yells(mtmp, "Halt, thief! You're under arrest!");
(void) angry_guards(FALSE);
break;
}
@@ -1219,15 +1215,11 @@ dumb:
if (DEADMONSTER(mtmp)) continue;
if (is_watch(mtmp->data) &&
mtmp->mpeaceful && couldsee(mtmp->mx, mtmp->my)) {
if (canspotmon(mtmp))
pline("%s yells:", Amonnam(mtmp));
else
You_hear("someone yell:");
if(levl[x][y].looted & D_WARNED) {
verbalize("Halt, vandal! You're under arrest!");
mon_yells(mtmp, "Halt, vandal! You're under arrest!");
(void) angry_guards(FALSE);
} else {
verbalize("Hey, stop damaging that door!");
mon_yells(mtmp, "Hey, stop damaging that door!");
levl[x][y].looted |= D_WARNED;
}
break;