Remove vestiges of old overlay source split
[trunk only]
This commit is contained in:
nethack.allison
78
src/shk.c
78
src/shk.c
@@ -16,9 +16,7 @@
|
||||
#ifdef KOPS
|
||||
STATIC_DCL void FDECL(makekops, (coord *));
|
||||
STATIC_DCL void FDECL(call_kops, (struct monst *,BOOLEAN_P));
|
||||
# ifdef OVLB
|
||||
STATIC_DCL void FDECL(kops_gone, (BOOLEAN_P));
|
||||
# endif /* OVLB */
|
||||
#endif /* KOPS */
|
||||
|
||||
#define IS_SHOP(x) (rooms[x].rtype >= SHOPBASE)
|
||||
@@ -65,11 +63,8 @@ STATIC_DCL void FDECL(dropped_container, (struct obj *, struct monst *,
|
||||
STATIC_DCL void FDECL(add_to_billobjs, (struct obj *));
|
||||
STATIC_DCL void FDECL(bill_box_content, (struct obj *, BOOLEAN_P, BOOLEAN_P,
|
||||
struct monst *));
|
||||
#ifdef OVL1
|
||||
static boolean FDECL(rob_shop, (struct monst *));
|
||||
#endif
|
||||
|
||||
#ifdef OVLB
|
||||
/*
|
||||
invariants: obj->unpaid iff onbill(obj) [unless bp->useup]
|
||||
obj->quan <= bp->bquan
|
||||
@@ -256,9 +251,6 @@ boolean ghostly;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* OVLB */
|
||||
#ifdef OVL3
|
||||
|
||||
/* Clear the unpaid bit on all of the objects in the list. */
|
||||
STATIC_OVL void
|
||||
clear_unpaid(list)
|
||||
@@ -270,8 +262,6 @@ register struct obj *list;
|
||||
list = list->nobj;
|
||||
}
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* either you paid or left the shop or the shopkeeper died */
|
||||
STATIC_OVL void
|
||||
@@ -320,9 +310,6 @@ register struct monst *shkp;
|
||||
return(total);
|
||||
}
|
||||
|
||||
#endif /* OVLB */
|
||||
#ifdef OVL1
|
||||
|
||||
#ifdef KOPS
|
||||
STATIC_OVL void
|
||||
call_kops(shkp, nearshop)
|
||||
@@ -700,9 +687,6 @@ shopper_financial_report()
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* OVL1 */
|
||||
#ifdef OVLB
|
||||
|
||||
int
|
||||
inhishop(mtmp)
|
||||
register struct monst *mtmp;
|
||||
@@ -833,8 +817,6 @@ register struct obj *obj, *merge;
|
||||
}
|
||||
dealloc_obj(obj);
|
||||
}
|
||||
#endif /* OVLB */
|
||||
#ifdef OVL3
|
||||
|
||||
STATIC_OVL long
|
||||
check_credit(tmp, shkp)
|
||||
@@ -878,8 +860,6 @@ register struct monst *shkp;
|
||||
ESHK(shkp)->robbed = robbed;
|
||||
}
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* return shkp to home position */
|
||||
void
|
||||
@@ -1060,13 +1040,6 @@ STATIC_VAR const char no_money[] = "Moreover, you%s have no money.";
|
||||
STATIC_VAR const char not_enough_money[] =
|
||||
"Besides, you don't have enough to interest %s.";
|
||||
|
||||
#else
|
||||
STATIC_VAR const char no_money[];
|
||||
STATIC_VAR const char not_enough_money[];
|
||||
#endif /*OVLB*/
|
||||
|
||||
#ifdef OVL3
|
||||
|
||||
STATIC_OVL long
|
||||
cheapest_item(shkp) /* delivers the cheapest item on the list */
|
||||
register struct monst *shkp;
|
||||
@@ -1082,8 +1055,6 @@ register struct monst *shkp;
|
||||
}
|
||||
return(gmin);
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVL0
|
||||
|
||||
int
|
||||
dopay()
|
||||
@@ -1471,8 +1442,6 @@ proceed:
|
||||
shtypes[eshkp->shoptype - SHOPBASE].name);
|
||||
return(1);
|
||||
}
|
||||
#endif /*OVL0*/
|
||||
#ifdef OVL3
|
||||
|
||||
/* return 2 if used-up portion paid */
|
||||
/* 1 if paid successfully */
|
||||
@@ -1582,8 +1551,6 @@ boolean itemize;
|
||||
update_inventory(); /* Done just once in dopay() if !itemize. */
|
||||
return buy;
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
static coord repo_location; /* repossession context */
|
||||
|
||||
@@ -1833,8 +1800,6 @@ unsigned id;
|
||||
/* not found at all */
|
||||
return (struct obj *)0;
|
||||
}
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL3
|
||||
|
||||
/* calculate the value that the shk will charge for [one of] an object */
|
||||
STATIC_OVL long
|
||||
@@ -1914,8 +1879,6 @@ register struct monst *shkp; /* if angry, impose a surcharge */
|
||||
if (shkp && ESHK(shkp)->surcharge) tmp += (tmp + 2L) / 3L;
|
||||
return tmp;
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* returns the price of a container's content. the price
|
||||
* of the "top" container is added in the calling functions.
|
||||
@@ -2008,8 +1971,6 @@ register struct obj *obj;
|
||||
picked_container(otmp);
|
||||
}
|
||||
}
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL3
|
||||
|
||||
/* calculate how much the shk will pay when buying [all of] an object */
|
||||
STATIC_OVL long
|
||||
@@ -2046,9 +2007,6 @@ register struct monst *shkp;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* called from doinv(invent.c) for inventory of unpaid objects */
|
||||
long
|
||||
unpaid_cost(unp_obj)
|
||||
@@ -2390,9 +2348,6 @@ register struct monst *shkp;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL3
|
||||
|
||||
STATIC_OVL long
|
||||
stolen_container(obj, shkp, price, ininv)
|
||||
register struct obj *obj;
|
||||
@@ -2432,8 +2387,6 @@ register boolean ininv;
|
||||
|
||||
return(price);
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
long
|
||||
stolen_value(obj, x, y, peaceful, silent)
|
||||
@@ -2946,9 +2899,6 @@ long cost;
|
||||
levl[x][y].seenv = SVALL;
|
||||
}
|
||||
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL0
|
||||
|
||||
/*
|
||||
* Do something about damage. Either (!croaked) try to repair it, or
|
||||
* (croaked) just discard damage structs for non-shared locations, since
|
||||
@@ -3180,8 +3130,7 @@ boolean catchup; /* restoring a level */
|
||||
#undef vert
|
||||
#undef horiz
|
||||
}
|
||||
#endif /*OVL0*/
|
||||
#ifdef OVL3
|
||||
|
||||
/*
|
||||
* shk_move: return 1: moved 0: didn't -1: let m_move do it -2: died
|
||||
*/
|
||||
@@ -3309,9 +3258,6 @@ struct monst *shkp;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* for use in levl_follower (mondata.c) */
|
||||
boolean
|
||||
is_fshk(mtmp)
|
||||
@@ -3592,8 +3538,7 @@ getcad:
|
||||
adjalign(-sgn(u.ualign.type));
|
||||
}
|
||||
}
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL0
|
||||
|
||||
/* called in dokick.c when we kick an object that might be in a store */
|
||||
boolean
|
||||
costly_spot(x, y)
|
||||
@@ -3609,8 +3554,6 @@ register xchar x, y;
|
||||
!(x == ESHK(shkp)->shk.x &&
|
||||
y == ESHK(shkp)->shk.y)));
|
||||
}
|
||||
#endif /*OVL0*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* called by dotalk(sounds.c) when #chatting; returns obj if location
|
||||
contains shop goods and shopkeeper is willing & able to speak */
|
||||
@@ -3680,8 +3623,6 @@ register struct obj *first_obj;
|
||||
}
|
||||
destroy_nhwindow(tmpwin);
|
||||
}
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL3
|
||||
|
||||
STATIC_OVL const char *
|
||||
shk_embellish(itm, cost)
|
||||
@@ -3712,8 +3653,6 @@ long cost;
|
||||
}
|
||||
return ".";
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* First 4 supplied by Ronen and Tamar, remainder by development team */
|
||||
const char *Izchak_speaks[]={
|
||||
@@ -3815,9 +3754,6 @@ register boolean silent;
|
||||
}
|
||||
#endif /* KOPS */
|
||||
|
||||
#endif /*OVLB*/
|
||||
#ifdef OVL3
|
||||
|
||||
STATIC_OVL long
|
||||
cost_per_charge(shkp, otmp, altusage)
|
||||
struct monst *shkp;
|
||||
@@ -3870,8 +3806,6 @@ boolean altusage; /* some items have an "alternate" use with different cost */
|
||||
}
|
||||
return(tmp);
|
||||
}
|
||||
#endif /*OVL3*/
|
||||
#ifdef OVLB
|
||||
|
||||
/* Charge the player for partial use of an unpaid object.
|
||||
*
|
||||
@@ -4028,9 +3962,6 @@ register xchar x, y;
|
||||
return(FALSE);
|
||||
}
|
||||
|
||||
#endif /* OVLB */
|
||||
#ifdef OVL2
|
||||
|
||||
char *
|
||||
shk_your(buf, obj)
|
||||
char *buf;
|
||||
@@ -4078,9 +4009,6 @@ struct obj *obj;
|
||||
return (char *)0;
|
||||
}
|
||||
|
||||
#endif /* OVL2 */
|
||||
#ifdef OVLB
|
||||
|
||||
#ifdef __SASC
|
||||
void
|
||||
sasc_bug(struct obj *op, unsigned x){
|
||||
@@ -4088,6 +4016,4 @@ sasc_bug(struct obj *op, unsigned x){
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* OVLB */
|
||||
|
||||
/*shk.c*/
|
||||
|
||||
Reference in New Issue
Block a user