From 1086f137de278979e6eb7cb8806b60c036d53846 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 17 Oct 2019 18:55:35 -0700 Subject: [PATCH] revert part of 4b87e858aa - partly eaten food Partly eaten globs is seems to be can'o'worms and the hack I just added to get_pricing_units() made things worse, so back that out. --- src/shk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/shk.c b/src/shk.c index a3a84d64b..0cb7e2ab1 100644 --- a/src/shk.c +++ b/src/shk.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 shk.c $NHDT-Date: 1571363148 2019/10/18 01:45:48 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.169 $ */ +/* NetHack 3.6 shk.c $NHDT-Date: 1571363715 2019/10/18 01:55:15 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.170 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2033,9 +2033,7 @@ struct obj *obj; { long units = obj->quan; - if (obj->oclass == FOOD_CLASS && obj->oeaten) { - units = 0L; - } else if (obj->globby) { + if (obj->globby) { /* globs must be sold by weight not by volume */ long unit_weight = (long) objects[obj->otyp].oc_weight, wt = (obj->owt > 0) ? (long) obj->owt : (long) weight(obj);