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

@@ -2430,27 +2430,6 @@ register struct monst *mon;
pline("%s tries to take your money, but fails...",
noit_Monnam(mon));
else {
#ifndef GOLDOBJ
long cost;
if (u.ugold > (long)LARGEST_INT - 10L)
cost = (long) rnd(LARGEST_INT) + 500L;
else
cost = (long) rnd((int)u.ugold + 10) + 500L;
if (mon->mpeaceful) {
cost /= 5L;
if (!cost) cost = 1L;
}
if (cost > u.ugold) cost = u.ugold;
if (!cost) verbalize("It's on the house!");
else {
pline("%s takes %ld %s for services rendered!",
noit_Monnam(mon), cost, currency(cost));
u.ugold -= cost;
mon->mgold += cost;
context.botl = 1;
}
#else
long cost;
long umoney = money_cnt(invent);
@@ -2470,7 +2449,6 @@ register struct monst *mon;
money2mon(mon, cost);
context.botl = 1;
}
#endif
}
if (!rn2(25)) mon->mcan = 1; /* monster is worn out */
if (!tele_restrict(mon)) (void) rloc(mon, FALSE);