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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-10 09:42:38 -05:00
parent d4a469a7a6 9641864861
commit cbcb1ea7eb
15 changed files with 142 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lock.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 lock.c $NHDT-Date: 1544442712 2018/12/10 11:51:52 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.82 $ */
/* NetHack 3.6 lock.c $NHDT-Date: 1547086531 2019/01/10 02:15:31 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.83 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */
@@ -186,12 +186,13 @@ boolean destroyit;
if (!rn2(3) || otmp->oclass == POTION_CLASS) {
chest_shatter_msg(otmp);
if (costly)
loss +=
stolen_value(otmp, u.ux, u.uy, peaceful_shk, TRUE);
loss += stolen_value(otmp, u.ux, u.uy, peaceful_shk, TRUE);
if (otmp->quan == 1L) {
obfree(otmp, (struct obj *) 0);
continue;
}
/* this works because we're sure to have at least 1 left;
otherwise it would fail since otmp is not in inventory */
useup(otmp);
}
if (box->otyp == ICE_BOX && otmp->otyp == CORPSE) {
@@ -737,7 +738,7 @@ boolean quietly;
return TRUE;
}
if (OBJ_AT(x, y)) {
objhere:
objhere:
if (!quietly)
pline("%s's in the way.", Something);
return TRUE;
@@ -803,7 +804,7 @@ doclose()
else if (portcullis || door->typ == DRAWBRIDGE_DOWN)
There("is no obvious way to close the drawbridge.");
else {
nodoor:
nodoor:
You("%s no door there.", Blind ? "feel" : "see");
}
return res;