License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index a961fba58205e759b614bcc5bb72368973ba2893..a1e65ea6597f9441cb47a559cdc12fe90581d551 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.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-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/>.
  *
  *  ---
  *
@@ -31,6 +30,7 @@
  *     Dave Pare, 1986
  *     Thomas Ruschak, 1992
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
@@ -133,8 +133,8 @@ tend(void)
            return RET_SYN;
        total = 0;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner &&
-               (getrel(getnatp(target.shp_own), player->cnum) < FRIENDLY))
+           if (!player->owner
+               && relations_with(target.shp_own, player->cnum) < FRIENDLY)
                continue;
            if (target.shp_uid == tender.shp_uid)
                continue;
@@ -228,11 +228,11 @@ tend_land(struct shpstr *tenderp, char *units)
        if (!snxtitem(&targets, EF_SHIP,
                      player->argp[4], "Ship to be tended? "))
            return RET_FAIL;
-       if (!check_land_ok(&land))
+       if (!check_ship_ok(tenderp) || !check_land_ok(&land))
            return RET_SYN;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner &&
-               (getrel(getnatp(target.shp_own), player->cnum) < FRIENDLY))
+           if (!player->owner
+               && relations_with(target.shp_own, player->cnum) < FRIENDLY)
                continue;
            if (target.shp_uid == tenderp->shp_uid)
                continue;