License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index c81694b02a81e19737e0689c15b7c187d8ea9214..b6b601b5bb02b38183e832ca2398e3c262bb2e0b 100644 (file)
--- a/src/lib/commands/foll.c
+++ b/src/lib/commands/foll.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-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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  foll.c: Set leader of a set of ships
- * 
+ *
  *  Known contributors to this file:
  *     Robert Forsman
  */
@@ -54,14 +53,13 @@ foll(void)
     if (!snxtitem(&nstr, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
     cp = getstarg(player->argp[2], "leader? ", buf);
-    if (cp == 0)
+    if (!cp)
        cp = "";
     good = sscanf(cp, "%d", &leader);
     if (!good)
        return RET_SYN;
     getship(leader, &ship);
-    if (ship.shp_own != player->cnum &&
-       getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY) {
+    if (relations_with(ship.shp_own, player->cnum) < FRIENDLY) {
        pr("That ship won't let you follow.\n");
        return RET_FAIL;
     }