Update copyright notice

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

diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c
index 690fbbe786a5b22b02d0a93b3699a1195effe1ea..4ceaa37836ed98cee528b3a52e26a83632b2fdec 100644 (file)
--- a/src/lib/commands/set.c
+++ b/src/lib/commands/set.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -73,7 +72,7 @@ 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");
@@ -90,11 +89,11 @@ set(void)
            return RET_FAIL;
        }
        trade.trd_type = type;
-       sprintf(prompt, "%s #%d; Price? ",
-               trade_nameof(&trade, &item), ni.cur);
-       if ((p = getstarg(player->argp[3], prompt, buf)) == 0)
+       sprintf(prompt, "%s #%d; price? ",
+               trade_nameof(&trade, &item.gen), ni.cur);
+       if (!(p = getstarg(player->argp[3], prompt, buf)))
            return RET_FAIL;
-       if (!trade_check_item_ok(&item))
+       if (!check_obj_ok(&item.gen))
            return RET_FAIL;
        if ((price = atoi(p)) < 0)
            continue;
@@ -112,11 +111,13 @@ set(void)
        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)
@@ -124,8 +125,8 @@ set(void)
            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_x = 1;
+           trade.trd_y = 0;
            trade.trd_type = type;
            trade.trd_owner = player->cnum;
            trade.trd_unitid = ni.cur;
@@ -135,7 +136,7 @@ set(void)
            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);
        }
     }