From 0e4083153c0b754535f02bf65a6616b37b09a929 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 11 Jul 2024 10:22:40 -0700 Subject: [PATCH] another EDITLEVEL increment Since save and bones files just got clobbered, make another clobbering change. The 'queuedpay' field added to shop's ESHK(shkp)->bill[] was replaced last week by a similar field in the transient itemizing bill. At the time, the old field was left in place to avoid incrementing EDITLEVEL. shkp->mextra->bill[] is saved and restored, so its queuedpay field was too. Eliminate that no longer used field. Unrelated: bill[]->useup is declared as boolean but being assigned 1 or 0. Change the assignments to use TRUE or FALSE. --- include/mextra.h | 3 +-- include/patchlevel.h | 4 ++-- src/shk.c | 15 +++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/mextra.h b/include/mextra.h index 13ba7f254..1d044406b 100644 --- a/include/mextra.h +++ b/include/mextra.h @@ -1,4 +1,4 @@ -/* NetHack 3.7 mextra.h $NHDT-Date: 1596498545 2020/08/03 23:49:05 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.30 $ */ +/* NetHack 3.7 mextra.h $NHDT-Date: 1720717969 2024/07/11 17:12:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.40 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -113,7 +113,6 @@ struct epri { struct bill_x { unsigned bo_id; boolean useup; - boolean queuedpay; long price; /* price per unit */ long bquan; /* amount used up */ }; diff --git a/include/patchlevel.h b/include/patchlevel.h index 6455239bd..f589da6a7 100644 --- a/include/patchlevel.h +++ b/include/patchlevel.h @@ -1,4 +1,4 @@ -/* NetHack 3.7 patchlevel.h $NHDT-Date: 1703294869 2023/12/23 01:27:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.249 $ */ +/* NetHack 3.7 patchlevel.h $NHDT-Date: 1720717988 2024/07/11 17:13:08 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.261 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -17,7 +17,7 @@ * Incrementing EDITLEVEL can be used to force invalidation of old bones * and save files. */ -#define EDITLEVEL 104 +#define EDITLEVEL 105 /* * Development status possibilities. diff --git a/src/shk.c b/src/shk.c index 2f999d2a3..5bd1abe1d 100644 --- a/src/shk.c +++ b/src/shk.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 shk.c $NHDT-Date: 1652299941 2022/05/11 20:12:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.232 $ */ +/* NetHack 3.7 shk.c $NHDT-Date: 1720717993 2024/07/11 17:13:13 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.298 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1134,7 +1134,7 @@ obfree(struct obj *obj, struct obj *merge) if ((bp = onbill(obj, shkp, FALSE)) != 0) { if (!merge) { - bp->useup = 1; + bp->useup = TRUE; obj->unpaid = 0; /* only for doinvbill */ /* for used up glob, put back original weight in case it gets formatted ('I x' or itemized billing) with 'wizweight' On */ @@ -1483,7 +1483,6 @@ make_itemized_bill( n = 0; /* number of entries in ibill[]; won't necessary match ebillct */ for (i = 0; i < ebillct; ++i) { bp = &eshkp->bill_p[i]; - bp->queuedpay = FALSE; /* [no longer used] */ /* find the object on the bill */ otmp = bp_to_obj(bp); if (!otmp) { @@ -1496,7 +1495,7 @@ make_itemized_bill( was first unpaid; otmp is on billobjs list where it can only be seen via Ix and itemized billing while paying shk */ otmp->quan = bp->bquan; - bp->useup = 1; /* (expected to be set already) */ + bp->useup = TRUE; /* (expected to be set already) */ } else if (otmp->quan < bp->bquan) { /* item is partly used up; we will create two entries in the augmented bill: one for the used up part here, another for @@ -3253,10 +3252,10 @@ add_one_tobill( bp->bo_id = obj->o_id; bp->bquan = obj->quan; if (dummy) { /* a dummy object must be inserted into */ - bp->useup = 1; /* the gb.billobjs chain here. crucial for */ + bp->useup = TRUE; /* the gb.billobjs chain here. crucial for */ add_to_billobjs(obj); /* eating floorfood in shop. see eat.c */ } else - bp->useup = 0; + bp->useup = FALSE; bp->price = get_cost(obj, shkp); if (obj->globby) { /* for globs, the amt charged for quan 1 depends on owt */ @@ -3556,7 +3555,7 @@ splitbill(struct obj *obj, struct obj *otmp) bp = &(ESHK(shkp)->bill_p[ESHK(shkp)->billct]); bp->bo_id = otmp->o_id; bp->bquan = otmp->quan; - bp->useup = 0; + bp->useup = FALSE; bp->price = tmp; ESHK(shkp)->billct++; } @@ -3579,7 +3578,7 @@ sub_one_frombill(struct obj *obj, struct monst *shkp) otmp->where = OBJ_FREE; otmp->quan = (bp->bquan -= obj->quan); otmp->owt = 0; /* superfluous */ - bp->useup = 1; + bp->useup = TRUE; add_to_billobjs(otmp); return; }