Update copyright notice

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

diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index 33278ff8c87c1efbc227e88046a6e63eddddcc27..6ea5f05898f8d5112d3fba254d89cfc252e590bb 100644 (file)
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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/>.
  *
  *  ---
  *
@@ -84,7 +83,7 @@ lupgr(void)
     int n;
     int tlev;
     int avail, cost;
-    long cash;
+    int cash;
 
     if (!snxtitem(&ni, EF_LAND, player->argp[2], NULL))
        return RET_SYN;
@@ -100,8 +99,7 @@ lupgr(void)
            continue;
        if (sect.sct_type != SCT_HEADQ || sect.sct_effic < 60)
            continue;
-       if (land.lnd_own != sect.sct_own
-           && getrel(getnatp(land.lnd_own), sect.sct_own) < FRIENDLY) {
+       if (relations_with(land.lnd_own, sect.sct_own) < FRIENDLY) {
            pr("You are not on friendly terms with the owner of unit %d!\n",
               land.lnd_uid);
            continue;
@@ -165,7 +163,7 @@ supgr(void)
     int n;
     int tlev;
     int avail, cost;
-    long cash;
+    int cash;
 
     if (!snxtitem(&ni, EF_SHIP, player->argp[2], NULL))
        return RET_SYN;
@@ -181,8 +179,7 @@ supgr(void)
            continue;
        if (sect.sct_type != SCT_HARBR || sect.sct_effic < 60)
            continue;
-       if (ship.shp_own != sect.sct_own
-           && getrel(getnatp(ship.shp_own), sect.sct_own) < FRIENDLY) {
+       if (relations_with(ship.shp_own, sect.sct_own) < FRIENDLY) {
            pr("You are not on friendly terms with the owner of ship %d!\n",
               ship.shp_uid);
            continue;
@@ -245,7 +242,7 @@ pupgr(void)
     int n;
     int tlev;
     int avail, cost;
-    long cash;
+    int cash;
 
     if (!snxtitem(&ni, EF_PLANE, player->argp[2], NULL))
        return RET_SYN;
@@ -261,8 +258,7 @@ pupgr(void)
            continue;
        if (sect.sct_type != SCT_AIRPT || sect.sct_effic < 60)
            continue;
-       if (plane.pln_own != sect.sct_own
-           && getrel(getnatp(plane.pln_own), sect.sct_own) < FRIENDLY) {
+       if (relations_with(plane.pln_own, sect.sct_own) < FRIENDLY) {
            pr("You are not on friendly terms with the owner of plane %d!\n",
               plane.pln_uid);
            continue;