Update copyright notice

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

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index 02f3794fe62d3d20dfc744b4f6fbef2274c50bc0..cf1b1e28d67abb078de3c679a747b13f7e0df058 100644 (file)
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.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-2012, 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/>.
  *
  *  ---
  *
@@ -177,11 +176,8 @@ trad(void)
        }
     }
     canspend = natp->nat_money - tally;
-    /*
-     * Find the destination sector for the plane before the trade is
-     * actually made, except for satellites in orbit.  Must be owned
-     * and must be a 60% airfield (except for VTOL planes).
-     */
+
+    /* Find the destination sector for the trade */
     if (((trade.trd_type == EF_PLANE) && !pln_is_in_orbit(&tg.plane))
        || (trade.trd_type == EF_NUKE)) {
        while (1) {
@@ -211,8 +207,7 @@ trad(void)
            }
            break;
        }
-    }
-    if (trade.trd_type == EF_LAND) {
+    } else if (trade.trd_type == EF_LAND) {
        while (1) {
            p = getstring("Destination sector: ", buf);
            if (!trade_check_ok(&trade, &tg))
@@ -238,6 +233,10 @@ trad(void)
            }
            break;
        }
+    } else {
+       /* This trade doesn't teleport; make destination invalid */
+       sx = 1;
+       sy = 0;
     }
 
     p = getstring("How much do you bid: ", buf);
@@ -284,6 +283,7 @@ check_trade(void)
     double tleft;
     float price;
     int saveid;
+    natid seller;
 
     for (n = 0; gettrade(n, &trade); n++) {
        if (trade.trd_unitid < 0)
@@ -316,6 +316,7 @@ check_trade(void)
            continue;
 
        saveid = trade.trd_unitid;
+       seller = trade.trd_owner;
        trade.trd_owner = 0;
        trade.trd_unitid = -1;
        if (!puttrade(n, &trade)) {
@@ -326,17 +327,17 @@ check_trade(void)
        price = trade.trd_price;
        natp = getnatp(trade.trd_maxbidder);
        if (natp->nat_money < price) {
-           nreport(trade.trd_maxbidder, N_WELCH_DEAL, trade.trd_owner, 1);
-           wu(0, trade.trd_owner,
+           nreport(trade.trd_maxbidder, N_WELCH_DEAL, seller, 1);
+           wu(0, seller,
               "%s tried to buy a %s #%d from you for $%.2f\n",
               cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
               saveid, price * tradetax);
-           wu(0, trade.trd_owner, "   but couldn't afford it.\n");
-           wu(0, trade.trd_owner,
+           wu(0, seller, "   but couldn't afford it.\n");
+           wu(0, seller,
               "   Your item was taken off the market.\n");
            wu(0, trade.trd_maxbidder,
               "You tried to buy %s #%d from %s for $%.2f\n",
-              trade_nameof(&trade, &tg), saveid, cname(trade.trd_owner),
+              trade_nameof(&trade, &tg), saveid, cname(seller),
               price);
            wu(0, trade.trd_maxbidder, "but couldn't afford it.\n");
            continue;
@@ -347,7 +348,7 @@ check_trade(void)
        natp->nat_money -= price;
        putnat(natp);
 
-       natp = getnatp(trade.trd_owner);
+       natp = getnatp(seller);
        natp->nat_money += roundavg(price * tradetax);
        putnat(natp);
 
@@ -395,15 +396,15 @@ check_trade(void)
        unit_give_away(&tg.gen, trade.trd_maxbidder, 0);
        put_empobj(trade.trd_type, saveid, &tg.gen);
 
-       nreport(trade.trd_owner, N_MAKE_SALE, trade.trd_maxbidder, 1);
-       wu(0, trade.trd_owner, "%s bought a %s #%d from you for $%.2f\n",
+       nreport(seller, N_MAKE_SALE, trade.trd_maxbidder, 1);
+       wu(0, seller, "%s bought %s #%d from you for $%.2f\n",
           cname(trade.trd_maxbidder), trade_nameof(&trade, &tg),
           saveid, price * tradetax);
        wu(0, trade.trd_maxbidder,
           "The bidding is over & you bought %s #%d from %s for $%.2f\n",
-          trade_nameof(&trade, &tg), saveid, cname(trade.trd_owner),
+          trade_nameof(&trade, &tg), saveid, cname(seller),
           price);
-   }
+    }
     return RET_OK;
 }