Make GOLDOBJ unconditional.

This commit is contained in:
Sean Hunt
2015-02-14 01:31:22 -05:00
parent 4f59f5c6fd
commit ac108cd365
58 changed files with 8 additions and 1196 deletions

View File

@@ -826,13 +826,8 @@ mpickgold(mtmp)
if ((gold = g_at(mtmp->mx, mtmp->my)) != 0) {
mat_idx = objects[gold->otyp].oc_material;
#ifndef GOLDOBJ
mtmp->mgold += gold->quan;
delobj(gold);
#else
obj_extract_self(gold);
add_to_minv(mtmp, gold);
#endif
if (cansee(mtmp->mx, mtmp->my) ) {
if (flags.verbose && !mtmp->isgd)
pline("%s picks up some %s.", Monnam(mtmp),
@@ -1731,9 +1726,6 @@ register struct monst *mdef;
mdrop_special_objs(mdef);
/* release rest of monster's inventory--it is removed from game */
discard_minvent(mdef);
#ifndef GOLDOBJ
mdef->mgold = 0L;
#endif
m_detach(mdef, mdef->data);
}
@@ -1789,16 +1781,6 @@ register struct monst *mdef;
oldminvent = obj->nobj;
(void) add_to_container(otmp, obj);
}
#ifndef GOLDOBJ
if (mdef->mgold) {
struct obj *au;
au = mksobj(GOLD_PIECE, FALSE, FALSE);
au->quan = mdef->mgold;
au->owt = weight(au);
(void) add_to_container(otmp, au);
mdef->mgold = 0;
}
#endif
/* Archeologists should not break unique statues */
if (mdef->data->geno & G_UNIQ)
otmp->spe = 1;