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

(check_trade): Fix bug that made your money evaporate when you didn't

Browse source 
have enough to pay.  This was aggravated by the removal of automatic
loans in rev. 1.15.  Clean up after that revision, belatedly.
This commit is contained in:
Markus Armbruster 2007-12-08 14:14:31 +00:00
parent 30458959e6
commit d475256cf1
1 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/commands/trad.c
View file

@ -288,8 +288,6 @@ check_trade(void)
struct trdstr trade; struct trdstr trade;
union empobj_storage tg; union empobj_storage tg;
time_t now; time_t now;
double subleft;
double monleft;
double tleft; double tleft;
float price; float price;
int saveid; int saveid;
@ -330,23 +328,9 @@ check_trade(void)
continue; continue;
} }
monleft = 0;
price = trade.trd_price; price = trade.trd_price;
natp = getnatp(trade.trd_maxbidder); natp = getnatp(trade.trd_maxbidder);
if (natp->nat_money <= 0) if (natp->nat_money < price) {
monleft = price;
if (natp->nat_money < price && natp->nat_money > 0) {
monleft = price - (natp->nat_money - 1);
natp->nat_money = 1;
price = price - monleft;
} else if (natp->nat_money > 0) {
monleft = 0;
natp->nat_money -= price;
}
subleft = monleft;
if (monleft > 0) {
nreport(trade.trd_maxbidder, N_WELCH_DEAL, trade.trd_owner, 1); nreport(trade.trd_maxbidder, N_WELCH_DEAL, trade.trd_owner, 1);
wu(0, trade.trd_owner, wu(0, trade.trd_owner,
"%s tried to buy a %s #%d from you for $%.2f\n", "%s tried to buy a %s #%d from you for $%.2f\n",
@ -364,14 +348,14 @@ check_trade(void)
} }
/* If we get this far, the sale will go through. */ /* If we get this far, the sale will go through. */
/* Only pay tax on the part you actually get cash for. As a break,
we don't tax the part you have to give a loan on. */
natp->nat_money -= price;
putnat(natp); putnat(natp);
natp = getnatp(trade.trd_owner); natp = getnatp(trade.trd_owner);
/* Make sure we subtract the extra amount */ natp->nat_money += roundavg(price * tradetax);
natp->nat_money += (roundavg(price * tradetax) - subleft);
putnat(natp); putnat(natp);
switch (trade.trd_type) { switch (trade.trd_type) {
case EF_NUKE: case EF_NUKE:
tg.nuke.nuk_x = trade.trd_x; tg.nuke.nuk_x = trade.trd_x;