Update copyright notice

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

diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index 9e6a3b28508b3a0b21f57da41ca5811664a1735f..20f8639907563f5332238b6b8b403423744583b6 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-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -33,19 +33,15 @@
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "sect.h"
-#include "ship.h"
+#include <config.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>
@@ -61,14 +57,13 @@ set(void)
     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");
@@ -77,10 +72,11 @@ set(void)
     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", p);
+       pr("You can sell only ships, planes, land units or nukes\n");
        return RET_SYN;
     }
     if (!snxtitem(&ni, type, player->argp[2]))
@@ -88,7 +84,7 @@ set(void)
     while (nxtitem(&ni, &item)) {
        if (!player->owner && !player->god)
            continue;
-       getsect(item.gen.trg_x, item.gen.trg_y, &sect);
+       getsect(item.gen.x, item.gen.y, &sect);
        if (!military_control(&sect)) {
            pr("Military control required to sell goods.\n");
            return RET_FAIL;
@@ -96,13 +92,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;
@@ -132,8 +125,8 @@ set(void)
                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;