License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / mission.c

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index ab8e58954ba1811a538f76753c6065d01680f125..4f50f352bac80e791a017f13229133249f14aff4 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.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-2011, 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/>.
  *
  *  ---
  *
@@ -105,7 +104,7 @@ ground_interdict(coord x, coord y, natid victim, char *s)
     memset(mi, 0, sizeof(mi));
     act[0] = 0;
     for (cn = 1; cn < MAXNOC; cn++) {
-       act[cn] = getrel(getnatp(cn), victim) <= HOSTILE;
+       act[cn] = relations_with(cn, victim) <= HOSTILE;
        emp_initque((struct emp_qelem *)&mi[cn]);
     }
 
@@ -187,10 +186,10 @@ unit_interdict(coord x, coord y, natid victim, char *s, int hardtarget,
     memset(mi, 0, sizeof(mi));
     other_act[0] = plane_act[0] = 0;
     for (cn = 1; cn < MAXNOC; cn++) {
-       rel = getrel(getnatp(cn), victim);
+       rel = relations_with(cn, victim);
        other_act[cn] = rel <= HOSTILE;
        plane_act[cn] = mission == MI_SINTERDICT
-           ? cn != victim && rel <= NEUTRAL : other_act[cn];
+           ? rel <= NEUTRAL : other_act[cn];
        emp_initque((struct emp_qelem *)&mi[cn]);
     }
 
@@ -1041,7 +1040,7 @@ air_damage(struct emp_qelem *bombers, coord x, coord y, int mission,
                   prplane(pp), xyas(x, y, pp->pln_own));
                continue;
            }
-           if (getrel(getnatp(pp->pln_own), victim) > HOSTILE) {
+           if (relations_with(pp->pln_own, victim) > HOSTILE) {
                wu(0, pp->pln_own,
                   "\t%s tracks %s %s at %s\n",
                   prplane(pp), cname(victim), s, xyas(x, y, pp->pln_own));