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

(trade_check_item_ok): New.

Browse source 
(trade_check_ok): Use it and simplify.

(set): Use new trade_check_item_ok().  The code replaced by it didn't
work (abusable bug).
This commit is contained in:
Markus Armbruster 2006-03-25 15:26:29 +00:00
parent 79714720cc
commit 38f3f7ea49
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/set.c
View file

@ -64,7 +64,6 @@ set(void)
struct nstr_item ni;
struct nstr_item ni_trade;
union trdgenstr item;
union trdgenstr check;
struct sctstr sect;
int freeslot;
int foundslot;
@ -98,13 +97,10 @@ set(void)
trade.trd_type = type;
sprintf(prompt, "%s #%d; Price? ",
trade_nameof(&trade, &item), ni.cur);
memcpy(&check, &item, sizeof(union trdgenstr));
if ((p = getstarg(player->argp[3], prompt, buf)) == 0)
break;
if (memcmp(&check, &item, sizeof(union trdgenstr))) {
pr("That item has changed!\n");
if (!trade_check_item_ok(&item))
return RET_FAIL;
}
if ((price = atoi(p)) < 0)
continue;
foundslot = -1;