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

shop billing

Browse Source 
Shop internals:  funnel all checks for whether an object is something
a shopkeeper will charge the hero for through one routine instead of having
duplication code which might eventually get out of synch.  There shouldn't
be any detectable change in behavior due to this.  No fixes entry necessary.
This commit is contained in:
nethack.rankin
2005-03-27 03:59:56 +00:00
parent 8e063814f4
commit 51f4a6b174
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shk.c
+22 -33
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)shk.c 3.5 2005/03/05 */ /* SCCS Id: @(#)shk.c 3.5 2005/03/26 */
/* 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. */
@@ -57,7 +57,7 @@ STATIC_DCL void FDECL(rile_shk, (struct monst *));
STATIC_DCL void FDECL(rouse_shk, (struct monst *,BOOLEAN_P)); STATIC_DCL void FDECL(rouse_shk, (struct monst *,BOOLEAN_P));
STATIC_DCL void FDECL(remove_damage, (struct monst *, BOOLEAN_P)); STATIC_DCL void FDECL(remove_damage, (struct monst *, BOOLEAN_P));
STATIC_DCL void FDECL(sub_one_frombill, (struct obj *, struct monst *)); STATIC_DCL void FDECL(sub_one_frombill, (struct obj *, struct monst *));
STATIC_DCL void FDECL(add_one_tobill, (struct obj *, BOOLEAN_P)); STATIC_DCL void FDECL(add_one_tobill, (struct obj *,BOOLEAN_P,struct monst *));
STATIC_DCL void FDECL(dropped_container, (struct obj *, struct monst *, STATIC_DCL void FDECL(dropped_container, (struct obj *, struct monst *,
BOOLEAN_P)); BOOLEAN_P));
STATIC_DCL void FDECL(add_to_billobjs, (struct obj *)); STATIC_DCL void FDECL(add_to_billobjs, (struct obj *));
@@ -2024,45 +2024,34 @@ register struct obj *unp_obj; /* known to be unpaid */
} }
STATIC_OVL void STATIC_OVL void
add_one_tobill(obj, dummy) add_one_tobill(obj, dummy, shkp)
register struct obj *obj; struct obj *obj;
register boolean dummy; boolean dummy;
struct monst *shkp;
{ {
register struct monst *shkp; struct eshk *eshkp;
register struct bill_x *bp; struct bill_x *bp;
register int bct; int bct;
register char roomno = *u.ushops;
if (!roomno) return; if (!billable(&shkp, obj, *u.ushops, TRUE)) return;
if (!(shkp = shop_keeper(roomno))) return; eshkp = ESHK(shkp);
if (!inhishop(shkp)) return;
if (onbill(obj, shkp, FALSE) || /* perhaps thrown away earlier */ if (eshkp->billct == BILLSZ) {
(obj->oclass == FOOD_CLASS && obj->oeaten)) You("got that for free!");
return; return;
if (ESHK(shkp)->billct == BILLSZ) {
You("got that for free!");
return;
} }
/* To recognize objects the shopkeeper is not interested in. -dgk bct = eshkp->billct;
*/ bp = &(eshkp->bill_p[bct]);
if (obj->no_charge) {
obj->no_charge = 0;
return;
}
bct = ESHK(shkp)->billct;
bp = &(ESHK(shkp)->bill_p[bct]);
bp->bo_id = obj->o_id; bp->bo_id = obj->o_id;
bp->bquan = obj->quan; bp->bquan = obj->quan;
if(dummy) { /* a dummy object must be inserted into */ if(dummy) { /* a dummy object must be inserted into */
bp->useup = 1; /* the billobjs chain here. crucial for */ bp->useup = 1; /* the billobjs chain here. crucial for */
add_to_billobjs(obj); /* eating floorfood in shop. see eat.c */ add_to_billobjs(obj); /* eating floorfood in shop. see eat.c */
} else bp->useup = 0; } else
bp->useup = 0;
bp->price = get_cost(obj, shkp); bp->price = get_cost(obj, shkp);
ESHK(shkp)->billct++; eshkp->billct++;
obj->unpaid = 1; obj->unpaid = 1;
} }
@@ -2094,7 +2083,7 @@ register struct monst *shkp;
/* the "top" box is added in addtobill() */ /* the "top" box is added in addtobill() */
if (!otmp->no_charge) if (!otmp->no_charge)
add_one_tobill(otmp, dummy); add_one_tobill(otmp, dummy, shkp);
if (Has_contents(otmp)) if (Has_contents(otmp))
bill_box_content(otmp, ininv, dummy, shkp); bill_box_content(otmp, ininv, dummy, shkp);
} }
@@ -2206,7 +2195,7 @@ boolean ininv, dummy, silent;
cltmp = contained_cost(obj, shkp, cltmp, FALSE, FALSE); cltmp = contained_cost(obj, shkp, cltmp, FALSE, FALSE);
gltmp = contained_gold(obj); gltmp = contained_gold(obj);
if(ltmp) add_one_tobill(obj, dummy); if(ltmp) add_one_tobill(obj, dummy, shkp);
if(cltmp) bill_box_content(obj, ininv, dummy, shkp); if(cltmp) bill_box_content(obj, ininv, dummy, shkp);
picked_container(obj); /* reset contained obj->no_charge */ picked_container(obj); /* reset contained obj->no_charge */
@@ -2221,7 +2210,7 @@ boolean ininv, dummy, silent;
obj->no_charge = 0; obj->no_charge = 0;
} else /* i.e., !container */ } else /* i.e., !container */
add_one_tobill(obj, dummy); add_one_tobill(obj, dummy, shkp);
if (shkp->mcanmove && !shkp->msleeping && !silent) { if (shkp->mcanmove && !shkp->msleeping && !silent) {
char buf[BUFSZ]; char buf[BUFSZ];