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

fix #H3134 - selling container for credit

Browse Source 
If a container holds anything that a shop wouldn't ordinarily
buy and sell and you sell it for gold, the 'foreign' contents
are marked no_charge and hero still owns them.  But selling the
same container+contents for credit instead of gold would take
shop possession of all the contents without increasing the
credit amount.

The fixes entry is longer than the fix.  It solves cited case but
I won't be surprised much if it messes up some other case(s).
This commit is contained in:
PatR
2020-12-11 22:32:38 -08:00
parent f489328836
commit 8d65d6dbf0
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shk.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 shk.c $NHDT-Date: 1606343581 2020/11/25 22:33:01 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.192 $ */
/* NetHack 3.7 shk.c $NHDT-Date: 1607754748 2020/12/12 06:32:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.193 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3192,13 +3192,14 @@ xchar x, y;
c = 'n';
if (c == 'y') {
shk_names_obj(
shkp, obj,
(g.sell_how != SELL_NORMAL)
? "traded %s for %ld zorkmid%s in %scredit."
: "relinquish %s and acquire %ld zorkmid%s in %scredit.",
tmpcr, (eshkp->credit > 0L) ? "additional " : "");
shk_names_obj(shkp, obj,
((g.sell_how != SELL_NORMAL)
? "traded %s for %ld zorkmid%s in %scredit."
: "relinquish %s and acquire %ld zorkmid%s in %scredit."),
tmpcr, (eshkp->credit > 0L) ? "additional " : "");
eshkp->credit += tmpcr;
if (container)
dropped_container(obj, shkp, TRUE);
subfrombill(obj, shkp);
} else {
if (c == 'q')