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

tin opener fix

Browse Source 
Applying a non-wielded tin opener and then declining to pick a tin to
open would wield the opener without having any time elapse.

Reformat the new tin opener code.

Remove a no-longer-used label in doapply() in order to avoid a warning
from gcc.
This commit is contained in:
PatR
2015-12-19 17:11:33 -08:00
parent 43bf9c978d
commit 4b69dde2d7
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apply.c
+1 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 apply.c $NHDT-Date: 1450481050 2015/12/18 23:24:10 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.214 $ */ /* NetHack 3.6 apply.c $NHDT-Date: 1450573880 2015/12/20 01:11:20 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.216 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -3537,7 +3537,6 @@ doapply()
break; break;
} }
pline("Sorry, I don't know how to use that."); pline("Sorry, I don't know how to use that.");
xit:
nomul(0); nomul(0);
return 0; return 0;
} }
src/eat.c
+15 -10
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 eat.c $NHDT-Date: 1449269916 2015/12/04 22:58:36 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.154 $ */ /* NetHack 3.6 eat.c $NHDT-Date: 1450573885 2015/12/20 01:11:25 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.156 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2581,9 +2581,9 @@ doeat()
int int
use_tin_opener(obj) use_tin_opener(obj)
register struct obj *obj; struct obj *obj;
{ {
register struct obj *otmp; struct obj *otmp;
int res = 0; int res = 0;
if (!carrying(TIN)) { if (!carrying(TIN)) {
@@ -2594,17 +2594,22 @@ register struct obj *obj;
if (obj != uwep) { if (obj != uwep) {
if (obj->cursed && obj->bknown) { if (obj->cursed && obj->bknown) {
char qbuf[QBUFSZ]; char qbuf[QBUFSZ];
(void) safe_qbuf(qbuf, "Really wield ", "?", obj, doname, ansimpleoname, "that");
if (ynq(qbuf) != 'y') return 0; if (ynq(safe_qbuf(qbuf, "Really wield ", "?",
obj, doname, thesimpleoname, "that")) != 'y')
return 0;
} }
if (!wield_tool(obj, "use")) return 0; if (!wield_tool(obj, "use"))
else res = 1; return 0;
res = 1;
} }
otmp = getobj((const char *)comestibles, "open"); otmp = getobj(comestibles, "open");
if (!otmp) return 0; if (!otmp)
return res;
start_tin(otmp); start_tin(otmp);
return(1); return 1;
} }
/* Take a single bite from a piece of food, checking for choking and /* Take a single bite from a piece of food, checking for choking and