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

yet more dropping while inside engulfer

Browse Source 
I don't know why we have two different functions which do exactly
the same thing (checking whether an item is unpaid or is a container
that holds at least one unpaid item), but switch the #H2504 fix to
use 'the other one' and reverse one of the changes made when using
the inventory one.
This commit is contained in:
PatR
2018-12-17 02:49:38 -08:00
parent a3a676a6bd
commit f9cef53758
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+1 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 extern.h $NHDT-Date: 1545036280 2018/12/17 08:44:40 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.672 $ */ /* NetHack 3.6 extern.h $NHDT-Date: 1545043771 2018/12/17 10:49:31 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.673 $ */
/* Copyright (c) Steve Creps, 1988. */ /* Copyright (c) Steve Creps, 1988. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -974,7 +974,6 @@ E boolean NDECL(have_lizard);
E struct obj *NDECL(u_have_novel); E struct obj *NDECL(u_have_novel);
E struct obj *FDECL(o_on, (unsigned int, struct obj *)); E struct obj *FDECL(o_on, (unsigned int, struct obj *));
E boolean FDECL(obj_here, (struct obj *, int, int)); E boolean FDECL(obj_here, (struct obj *, int, int));
E int FDECL(ckunpaid, (struct obj *));
E boolean NDECL(wearing_armor); E boolean NDECL(wearing_armor);
E boolean FDECL(is_worn, (struct obj *)); E boolean FDECL(is_worn, (struct obj *));
E struct obj *FDECL(g_at, (int, int)); E struct obj *FDECL(g_at, (int, int));
src/do.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 do.c $NHDT-Date: 1545036287 2018/12/17 08:44:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.180 $ */ /* NetHack 3.6 do.c $NHDT-Date: 1545043771 2018/12/17 10:49:31 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.181 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -588,7 +588,7 @@ register struct obj *obj;
/* doname can call s_suffix, reusing its buffer */ /* doname can call s_suffix, reusing its buffer */
Strcpy(monbuf, s_suffix(mon_nam(u.ustuck))); Strcpy(monbuf, s_suffix(mon_nam(u.ustuck)));
onam_p = ckunpaid(obj) ? yobjnam(obj, (char *) 0) : doname(obj); onam_p = is_unpaid(obj) ? yobjnam(obj, (char *) 0) : doname(obj);
You("drop %s into %s %s.", onam_p, monbuf, You("drop %s into %s %s.", onam_p, monbuf,
mbodypart(u.ustuck, STOMACH)); mbodypart(u.ustuck, STOMACH));
} }
@@ -683,7 +683,7 @@ boolean with_impact;
could_grow = (obj->corpsenm == PM_WRAITH); could_grow = (obj->corpsenm == PM_WRAITH);
could_heal = (obj->corpsenm == PM_NURSE); could_heal = (obj->corpsenm == PM_NURSE);
} }
if (ckunpaid(obj)) if (is_unpaid(obj))
(void) stolen_value(obj, u.ux, u.uy, TRUE, FALSE); (void) stolen_value(obj, u.ux, u.uy, TRUE, FALSE);
(void) mpickobj(u.ustuck, obj); (void) mpickobj(u.ustuck, obj);
if (is_animal(u.ustuck->data)) { if (is_animal(u.ustuck->data)) {
src/invent.c
+3 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 invent.c $NHDT-Date: 1545036289 2018/12/17 08:44:49 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.243 $ */ /* NetHack 3.6 invent.c $NHDT-Date: 1545043772 2018/12/17 10:49:32 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.244 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -26,6 +26,7 @@ STATIC_DCL void FDECL(compactify, (char *));
STATIC_DCL boolean FDECL(taking_off, (const char *)); STATIC_DCL boolean FDECL(taking_off, (const char *));
STATIC_DCL boolean FDECL(putting_on, (const char *)); STATIC_DCL boolean FDECL(putting_on, (const char *));
STATIC_PTR int FDECL(ckvalidcat, (struct obj *)); STATIC_PTR int FDECL(ckvalidcat, (struct obj *));
STATIC_PTR int FDECL(ckunpaid, (struct obj *));
STATIC_PTR char *FDECL(safeq_xprname, (struct obj *)); STATIC_PTR char *FDECL(safeq_xprname, (struct obj *));
STATIC_PTR char *FDECL(safeq_shortxprname, (struct obj *)); STATIC_PTR char *FDECL(safeq_shortxprname, (struct obj *));
STATIC_DCL char FDECL(display_pickinv, (const char *, const char *, STATIC_DCL char FDECL(display_pickinv, (const char *, const char *,
@@ -1824,7 +1825,7 @@ struct obj *otmp;
return (int) allow_category(otmp); return (int) allow_category(otmp);
} }
int STATIC_PTR int
ckunpaid(otmp) ckunpaid(otmp)
struct obj *otmp; struct obj *otmp;
{ {