License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index fd35af58ac17210f7e4307960f0b97ccce7a0cfc..854d58874e1eb98eb64273de0b6396693fbaf9c0 100644 (file)
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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,30 +14,24 @@
  *  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.
  *
  *  ---
  *
  *  rela.c: Show relations with other countries
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
 #include "commands.h"
 #include "optlist.h"
 
@@ -55,25 +49,20 @@ rela(void)
     natid as;
     int n;
 
-    if (player->argp[1] == 0)
+    if (!player->argp[1])
        as = player->cnum;
     else {
-       if ((n = natarg(player->argp[1], "Which country? ")) < 0) {
-           pr("Bad country number\n");
+       if ((n = natarg(player->argp[1], NULL)) < 0)
            return RET_SYN;
-       }
        as = (natid)n;
     }
-    if ((natp = getnatp(as)) == 0) {
-       pr("Bad country number %d\n", player->cnum);
-       return RET_SYN;
-    }
+    natp = getnatp(as);
     pr("\t%s Diplomatic Relations Report\t", cname(as));
     prdate();
     pr("\n  Formal Relations         %5s      theirs\n",
        player->cnum == as ? "yours" : "his");
     for (cn = 1; cn < MAXNOC; cn++) {
-       if ((np = getnatp(cn)) == 0)
+       if (!(np = getnatp(cn)))
            break;
        if (cn == as)
            continue;