/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* set.c: Place units/ships/planes/nukes up for sale.
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Pat Loney, 1992
check_trade();
p = getstarg(player->argp[1], "Ship, plane, land unit or nuke? ", buf);
- if (p == 0)
+ if (!p)
return RET_SYN;
if ((type = ef_byname_from(p, ef_saleable)) < 0) {
pr("You can sell only ships, planes, land units or nukes\n");
return RET_SYN;
}
- if (!snxtitem(&ni, type, player->argp[2]))
+ if (!snxtitem(&ni, type, player->argp[2], NULL))
return RET_SYN;
while (nxtitem(&ni, &item)) {
if (!player->owner && !player->god)
trade.trd_type = type;
sprintf(prompt, "%s #%d; Price? ",
trade_nameof(&trade, &item), ni.cur);
- if ((p = getstarg(player->argp[3], prompt, buf)) == 0)
- break;
+ if (!(p = getstarg(player->argp[3], prompt, buf)))
+ return RET_FAIL;
if (!trade_check_item_ok(&item))
return RET_FAIL;
if ((price = atoi(p)) < 0)
if (foundslot >= 0) {
pr("%s #%d (lot #%d) removed from trading\n",
trade_nameof(&trade, &item), ni.cur, foundslot);
- memset(&trade, 0, sizeof(trade));
+ trade.trd_owner = 0;
puttrade(ni_trade.cur, &trade);
}
} else {
id = foundslot;
else if (freeslot >= 0)
id = freeslot;
- else {
- ef_extend(EF_TRADE, 1);
+ else
id = ni_trade.cur;
- }
+ ef_blank(EF_TRADE, id, &trade);
trade.trd_x = item.gen.x;
trade.trd_y = item.gen.y;
trade.trd_type = type;
trade.trd_owner = player->cnum;
- trade.trd_uid = id;
trade.trd_unitid = ni.cur;
trade.trd_price = price;
(void)time(&now);