/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
}
trade.trd_type = type;
sprintf(prompt, "%s #%d; price? ",
- trade_nameof(&trade, &item), ni.cur);
+ trade_nameof(&trade, &item.gen), ni.cur);
if (!(p = getstarg(player->argp[3], prompt, buf)))
return RET_FAIL;
if (!check_obj_ok(&item.gen))
if (price <= 0) {
if (foundslot >= 0) {
pr("%s #%d (lot #%d) removed from trading\n",
- trade_nameof(&trade, &item), ni.cur, foundslot);
+ trade_nameof(&trade, &item.gen), ni.cur, foundslot);
trade.trd_owner = 0;
puttrade(ni_trade.cur, &trade);
}
} else {
+ if (trade_has_unsalable_cargo(&item.gen, 1))
+ return RET_FAIL;
if (foundslot >= 0)
id = foundslot;
else if (freeslot >= 0)
trade.trd_maxbidder = player->cnum;
puttrade(id, &trade);
pr("%s #%d (lot #%d) price %s to $%d\n",
- trade_nameof(&trade, &item), ni.cur,
+ trade_nameof(&trade, &item.gen), ni.cur,
id, foundslot >= 0 ? "reset" : "set", price);
}
}