Update copyright notice

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

diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c
index 53ccb62df7aa6c61a73a97c503ba897b59920769..544923b34507f66b6f6003966025aebd86a9e354 100644 (file)
--- a/src/lib/subs/natarg.c
+++ b/src/lib/subs/natarg.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-2020, 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/>.
  *
  *  ---
  *
@@ -28,14 +27,13 @@
  *  natarg.c: Return countr # given country name or country #
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
 
 #include <ctype.h>
 #include <stdlib.h>
-#include "file.h"
 #include "match.h"
 #include "misc.h"
 #include "nat.h"
@@ -45,7 +43,8 @@
 
 /*
  * Get nation argument.
- * If ARG is not empty, use it, else prompt for input using PROMPT.
+ * If @arg is not empty, use it
+ * Else prompt for input using @prompt.
  * If no input is provided, return NULL.
  * If the argument identifies a country, return its getnatp() value.
  * Else complain and return NULL.
@@ -59,7 +58,7 @@ natargp(char *arg, char *prompt)
     struct natstr *np;
 
     arg = getstarg(arg, prompt, buf);
-    if (arg == 0 || *arg == 0)
+    if (!arg || !*arg)
        return NULL;
     if (isdigit(*arg))
        n = atoi(arg);
@@ -80,7 +79,8 @@ natargp(char *arg, char *prompt)
 
 /*
  * Get nation argument.
- * If ARG is not empty, use it, else prompt for input using PROMPT.
+ * If @arg is not empty, use it.
+ * Else prompt for input using @prompt.
  * If no input is provided, return -1.
  * If the argument identifies a country, return its number.  getnatp()
  * can be assumed to succeed for this number.
@@ -95,7 +95,8 @@ natarg(char *arg, char *prompt)
     if (!np)
        return -1;
     if (opt_HIDDEN) {
-       if (!player->god && !getcontact(getnatp(player->cnum), np->nat_cnum)) {
+       if (!player->god
+           && !in_contact(player->cnum, np->nat_cnum)) {
            if (np->nat_stat != STAT_GOD) {
                pr("Country '%s' has not been contacted.\n", arg);
                return -1;