Update copyright notice

[empserver] / src / lib / commands / set.c

diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index 9c316d228914bea255b4b40d12a85fe819ccd36f..b599493754ae431767a3275ea36f65be6df123aa 100644 (file)
--- a/src/lib/commands/set.c
+++ b/src/lib/commands/set.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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
@@ -26,7 +26,7 @@
  *  ---
  *
  *  set.c: Place units/ships/planes/nukes up for sale.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Pat Loney, 1992
@@ -35,19 +35,13 @@
 
 #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>
@@ -63,13 +57,13 @@ set(void)
     struct trdstr trade;
     struct nstr_item ni;
     struct nstr_item ni_trade;
-    union trdgenstr item;
+    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");
@@ -79,13 +73,13 @@ set(void)
     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)
@@ -98,8 +92,8 @@ set(void)
        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)
@@ -119,7 +113,7 @@ set(void)
            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 {
@@ -127,15 +121,13 @@ set(void)
                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);