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

buy: Don't continue when lot changes while asking for bid

Browse source 
When the lot being bid for changes while the player is at the "How
much" prompt, we report "Commodity #%d has changed!", and continue
with the changed lot.

If continuing is okay, we should keep quiet.  We did that until commit
40b11c098 "Fix buy not to wipe out concurrent updates", v4.3.27.  Okay
when only the lot's price changed.

However, the lot could have gone away, or even be reused for something
else.  Failing the command seems safest for the player, so do that.
It's how we use the check_FOO_ok() elsewhere.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2021-01-12 21:42:42 +01:00
parent 37af1d7eb9
commit 6a30258d31
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,8 @@ buy(void)
bid = atof(p); bid = atof(p);
if (bid <= 0) if (bid <= 0)
return RET_FAIL; return RET_FAIL;
if (!check_comm_ok(&comm))
return RET_FAIL;
if (natp->nat_money < bid * comm.com_amount * buytax) { if (natp->nat_money < bid * comm.com_amount * buytax) {
pr("This purchase would cost %.2f, %.2f more than you have.\n", pr("This purchase would cost %.2f, %.2f more than you have.\n",
bid * comm.com_amount * buytax, bid * comm.com_amount * buytax,
@ -126,7 +128,6 @@ buy(void)
} }
} }
canspend = natp->nat_money - tally; canspend = natp->nat_money - tally;
check_comm_ok(&comm);
if (bid * comm.com_amount * buytax > canspend) { if (bid * comm.com_amount * buytax > canspend) {
pr("You have overextended yourself in the market\n"); pr("You have overextended yourself in the market\n");
pr("You can not bid on the current items at that price.\n"); pr("You can not bid on the current items at that price.\n");