Update copyright notice

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

diff --git a/src/lib/commands/reje.c b/src/lib/commands/reje.c
index 0f2144d03b090e73b90e90084e4611347d5720e8..c2f1c3f9878fcedcb247772faac6383681aef70f 100644 (file)
--- a/src/lib/commands/reje.c
+++ b/src/lib/commands/reje.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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,45 +14,37 @@
  *  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.
  *
  *  ---
  *
- *  reje.c: Refuse telegrams/annos/treaties/loans from countries
- * 
+ *  reje.c: Refuse telegrams/annos/loans from 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 "nsc.h"
 #include "commands.h"
-#include "optlist.h"
 
 int
 reje(void)
 {
-    register s_char *p;
+    char *p;
     int rel;
     int do_undo;
     struct natstr nat;
     struct nstr_item ni;
-    s_char buf[1024];
+    char buf[1024];
 
-    if ((p = getstarg(player->argp[1], "reject or accept? ", buf)) == 0)
+    if (!(p = getstarg(player->argp[1], "reject or accept? ", buf)))
        return RET_SYN;
     switch (*p) {
     case 'r':
@@ -65,9 +57,9 @@ reje(void)
        pr("That's not one of the choices!\n");
        return RET_SYN;
     }
-    if ((p =
-        getstarg(player->argp[2],
-                 "mail, treaties, loans, or announcements? ", buf)) == 0)
+    p = getstarg(player->argp[2],
+                "mail, loans, or announcements? ", buf);
+    if (!p)
        return RET_SYN;
     switch (*p) {
     case 'a':
@@ -79,24 +71,21 @@ reje(void)
     case 'm':
        rel = REJ_TELE;
        break;
-    case 't':
-       rel = REJ_TREA;
-       break;
     default:
        pr("That's not one of the choices!\n");
        return RET_SYN;
     }
-    if (!snxtitem(&ni, EF_NATION, player->argp[3]))
+    if (!snxtitem(&ni, EF_NATION, player->argp[3], NULL))
        return RET_SYN;
     while (nxtitem(&ni, &nat)) {
        if (nat.nat_stat == STAT_GOD) {
-           pr("You may not reject/accept stuff from %s\nbecause they are a deity.\n", nat.nat_cnam);
+           pr("You may not reject/accept stuff from %s\n"
+              "because they are a deity.\n",
+              nat.nat_cnam);
            continue;
        }
-       if (opt_HIDDEN) {
-           if (!getcontact(getnatp(player->cnum), ni.cur))
-               continue;
-       }
+       if (nat.nat_stat == STAT_UNUSED)
+           continue;
        switch (rel) {
        case REJ_ANNO:
            pr("%s annos from %s\n",
@@ -110,10 +99,6 @@ reje(void)
            pr("%s teles from %s\n",
               (do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
            break;
-       case REJ_TREA:
-           pr("%s treaties from %s\n",
-              (do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
-           break;
        }
        setrej(player->cnum, (natid)ni.cur, do_undo, rel);
     }