/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
#include <config.h>
-#include "misc.h"
-#include "sect.h"
-#include "ship.h"
+#include "commands.h"
+#include "empobj.h"
#include "land.h"
+#include "optlist.h"
#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
+#include "ship.h"
#include "trade.h"
-#include "file.h"
-#include "player.h"
-#include "commands.h"
-#include "optlist.h"
/*
* format: set <type> <SHIP/NUKE> <PRICE>
struct trdstr trade;
struct nstr_item ni;
struct nstr_item ni_trade;
- union trdgenstr item;
- union trdgenstr check;
+ union empobj_storage item;
struct sctstr sect;
int freeslot;
int foundslot;
int id;
time_t now;
- s_char buf[1024];
+ char buf[1024];
if (!opt_MARKET) {
pr("The market is disabled.\n");
check_market();
check_trade();
- if ((p = getstarg(player->argp[1], "Ship, plane, land unit or nuke? ", buf)) == 0)
+ p = getstarg(player->argp[1], "Ship, plane, land unit or nuke? ", buf);
+ if (p == 0)
return RET_SYN;
if ((type = ef_byname_from(p, ef_saleable)) < 0) {
pr("You can sell only ships, planes, land units or nukes\n");
while (nxtitem(&ni, &item)) {
if (!player->owner && !player->god)
continue;
- getsect(item.gen.trg_x, item.gen.trg_y, §);
+ getsect(item.gen.x, item.gen.y, §);
if (!military_control(§)) {
pr("Military control required to sell goods.\n");
return RET_FAIL;
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;
ef_extend(EF_TRADE, 1);
id = ni_trade.cur;
}
- trade.trd_x = item.gen.trg_x;
- trade.trd_y = item.gen.trg_y;
+ 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;