Update copyright notice

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

diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c
index 10944e95ccc8ab22f4700bc8bbf52b820f78601f..fe0026b6d5a57e0f4f5043a8a25a7989d3ffb89d 100644 (file)
--- a/src/lib/commands/payo.c
+++ b/src/lib/commands/payo.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, 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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  payo.c: Calculate trade ship payoffs
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  */
@@ -48,11 +47,7 @@ payo(void)
     int dist;
     float cash = 0.0;
 
-    if (!opt_TRADESHIPS) {
-       pr("Tradeships are not enabled.\n");
-       return RET_FAIL;
-    }
-    if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
+    if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
 
     nships = 0;
@@ -76,12 +71,12 @@ payo(void)
        if (ship.shp_own != ship.shp_orig_own && !player->god) {
            /* Don't disclose construction site to pirates! */
            pr("    ?     ");
-           prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+           prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
            pr("   ? $  ?\n");
            continue;
        }
-       prxy("%4d,%-4d ", ship.shp_orig_x, ship.shp_orig_y, player->cnum);
-       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d ", ship.shp_orig_x, ship.shp_orig_y);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
 
        getsect(ship.shp_x, ship.shp_y, &sect);