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

Fix market not to expropriate sellers of units

Browse source 
When a ship, plane, land unit or nuke is sold, the seller is replaced
by POGO: POGO gets the money, the telegrams and makes the news.
Likewise when a sale fails because the buyer can't pay.

Broken in commit 94a3108b, v4.3.17.  Reported by Scott C. Zielinski.
This commit is contained in:
Markus Armbruster 2012-02-05 19:31:35 +01:00
parent 904822e344
commit b4f076fc36
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -283,6 +283,7 @@ check_trade(void)
double tleft; double tleft;
float price; float price;
int saveid; int saveid;
natid seller;
for (n = 0; gettrade(n, &trade); n++) { for (n = 0; gettrade(n, &trade); n++) {
if (trade.trd_unitid < 0) if (trade.trd_unitid < 0)
@ -315,6 +316,7 @@ check_trade(void)
continue; continue;
saveid = trade.trd_unitid; saveid = trade.trd_unitid;
seller = trade.trd_owner;
trade.trd_owner = 0; trade.trd_owner = 0;
trade.trd_unitid = -1; trade.trd_unitid = -1;
if (!puttrade(n, &trade)) { if (!puttrade(n, &trade)) {
@ -325,17 +327,17 @@ check_trade(void)
price = trade.trd_price; price = trade.trd_price;
natp = getnatp(trade.trd_maxbidder); natp = getnatp(trade.trd_maxbidder);
if (natp->nat_money < price) { if (natp->nat_money < price) {
nreport(trade.trd_maxbidder, N_WELCH_DEAL, trade.trd_owner, 1); nreport(trade.trd_maxbidder, N_WELCH_DEAL, seller, 1);
wu(0, trade.trd_owner, wu(0, seller,
"%s tried to buy a %s #%d from you for $%.2f\n", "%s tried to buy a %s #%d from you for $%.2f\n",
cname(trade.trd_maxbidder), trade_nameof(&trade, &tg), cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
saveid, price * tradetax); saveid, price * tradetax);
wu(0, trade.trd_owner, " but couldn't afford it.\n"); wu(0, seller, " but couldn't afford it.\n");
wu(0, trade.trd_owner, wu(0, seller,
" Your item was taken off the market.\n"); " Your item was taken off the market.\n");
wu(0, trade.trd_maxbidder, wu(0, trade.trd_maxbidder,
"You tried to buy %s #%d from %s for $%.2f\n", "You tried to buy %s #%d from %s for $%.2f\n",
trade_nameof(&trade, &tg), saveid, cname(trade.trd_owner), trade_nameof(&trade, &tg), saveid, cname(seller),
price); price);
wu(0, trade.trd_maxbidder, "but couldn't afford it.\n"); wu(0, trade.trd_maxbidder, "but couldn't afford it.\n");
continue; continue;
@ -346,7 +348,7 @@ check_trade(void)
natp->nat_money -= price; natp->nat_money -= price;
putnat(natp); putnat(natp);
natp = getnatp(trade.trd_owner); natp = getnatp(seller);
natp->nat_money += roundavg(price * tradetax); natp->nat_money += roundavg(price * tradetax);
putnat(natp); putnat(natp);
@ -394,13 +396,13 @@ check_trade(void)
unit_give_away(&tg.gen, trade.trd_maxbidder, 0); unit_give_away(&tg.gen, trade.trd_maxbidder, 0);
put_empobj(trade.trd_type, saveid, &tg.gen); put_empobj(trade.trd_type, saveid, &tg.gen);
nreport(trade.trd_owner, N_MAKE_SALE, trade.trd_maxbidder, 1); nreport(seller, N_MAKE_SALE, trade.trd_maxbidder, 1);
wu(0, trade.trd_owner, "%s bought a %s #%d from you for $%.2f\n", wu(0, seller, "%s bought a %s #%d from you for $%.2f\n",
cname(trade.trd_maxbidder), trade_nameof(&trade, &tg), cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
saveid, price * tradetax); saveid, price * tradetax);
wu(0, trade.trd_maxbidder, wu(0, trade.trd_maxbidder,
"The bidding is over & you bought %s #%d from %s for $%.2f\n", "The bidding is over & you bought %s #%d from %s for $%.2f\n",
trade_nameof(&trade, &tg), saveid, cname(trade.trd_owner), trade_nameof(&trade, &tg), saveid, cname(seller),
price); price);
} }
return RET_OK; return RET_OK;