Update copyright notice

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

diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c
index b73a16b3325fb183fee971f41ffbda3dce9153b5..40096f2570d5880987b503ba6bca27ea9eb97d8c 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-2005, 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,33 +14,27 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  payo.c: Calculate trade ship payoffs
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  */
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 payo(void)
@@ -53,21 +47,13 @@ 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;
     while (nxtitem(&ni, &ship)) {
        if (!player->owner || ship.shp_own == 0)
            continue;
-       if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
-           pr("bad ship type %d (#%d)\n", ship.shp_type, ni.cur);
-           continue;
-       }
        mp = &mchr[(int)ship.shp_type];
 
        if (!(mp->m_flags & M_TRADE))
@@ -85,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);
 
@@ -101,14 +87,14 @@ payo(void)
        if (dist < trade_1_dist)
            cash = 0;
        else if (dist < trade_2_dist)
-           cash = (1.0 + trade_1 * ((float)dist));
+           cash = 1.0 + trade_1 * dist;
        else if (dist < trade_3_dist)
-           cash = (1.0 + trade_2 * ((float)dist));
+           cash = 1.0 + trade_2 * dist;
        else
-           cash = (1.0 + trade_3 * ((float)dist));
+           cash = 1.0 + trade_3 * dist;
 
        cash *= mp->m_cost;
-       cash *= (((float)ship.shp_effic) / 100.0);
+       cash *= ship.shp_effic / 100.0;
 
        if (sect.sct_own && (sect.sct_own != ship.shp_own))
            cash *= (1.0 + trade_ally_bonus);