empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(check_market): Fix missing putnat(). Belatedly clean up after the

Browse source 
removal of automatic loans in rev. 1.18.
This commit is contained in:
Markus Armbruster 2007-12-08 14:17:03 +00:00
parent d475256cf1
commit 4b715e9267
1 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/lib/commands/buy.c
View file

@ -204,10 +204,7 @@ check_market(void)
int m; int m;
int n; int n;
time_t now; time_t now;
double tmoney;
double tleft; double tleft;
double subleft;
double monleft;
double gain; double gain;
double price; double price;
@ -226,31 +223,14 @@ check_market(void)
sect = getsectp(comm.com_x, comm.com_y); sect = getsectp(comm.com_x, comm.com_y);
m = sect->sct_item[comm.com_type]; m = sect->sct_item[comm.com_type];
monleft = 0;
price = comm.com_price * comm.com_amount * buytax; price = comm.com_price * comm.com_amount * buytax;
gain = comm.com_price * comm.com_amount; gain = comm.com_price * comm.com_amount;
natp = getnatp(comm.com_maxbidder); natp = getnatp(comm.com_maxbidder);
tmoney = natp->nat_money; if (natp->nat_money < price) {
if (tmoney <= 0)
monleft = price;
if (tmoney < price && tmoney > 0) {
monleft = price - (tmoney - 1);
tmoney = 1;
price = price - monleft;
} else if (tmoney > 0) {
monleft = 0;
tmoney = tmoney - price;
}
/* Subtract the amount of money that needs to come out in a loan. */
subleft = monleft;
if (monleft > 0) {
nreport(comm.com_maxbidder, N_WELCH_DEAL, comm.com_owner, 1); nreport(comm.com_maxbidder, N_WELCH_DEAL, comm.com_owner, 1);
wu(0, comm.com_maxbidder, wu(0, comm.com_maxbidder,
"You didn't have enough cash/credit to cover the cost.\n"); "You didn't have enough cash to cover the cost.\n");
wu(0, comm.com_owner, wu(0, comm.com_owner,
"Sale #%d fell through. Goods remain on the market.\n", n); "Sale #%d fell through. Goods remain on the market.\n", n);
comm.com_maxbidder = comm.com_owner; comm.com_maxbidder = comm.com_owner;
@ -278,11 +258,11 @@ check_market(void)
"You just bought %d %s from %s for $%.2f\n", "You just bought %d %s from %s for $%.2f\n",
comm.com_amount, ichr[comm.com_type].i_name, comm.com_amount, ichr[comm.com_type].i_name,
cname(comm.com_owner), gain * buytax); cname(comm.com_owner), gain * buytax);
natp->nat_money -= roundavg(price);
putnat(natp);
natp = getnatp(comm.com_owner); natp = getnatp(comm.com_owner);
/* Make sure we subtract the amount that came out in a loan */ natp->nat_money += roundavg(gain);
natp->nat_money += (gain - subleft); putnat(natp);
natp = getnatp(comm.com_maxbidder);
natp->nat_money = tmoney;
comm.com_owner = 0; comm.com_owner = 0;
} }
comm.com_owner = 0; comm.com_owner = 0;