Update copyright notice

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

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index ff006ef19b781b300b9a4010a2928710e444fd48..7118419c9ecbc07f3dcb4a203f39beb028e81f76 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2017, 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,33 +14,30 @@
  *  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.
  *
  *  ---
  *
- *  acce.c: Report rejection status of telegrams/treaties/annos/loans
- * 
+ *  acce.c: Report rejection status of telegrams/annos/loans
+ *
  *  Known contributors to this file:
- *     
+ *     Markus Armbruster, 2006-2016
  */
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
+#include <config.h>
+
 #include "commands.h"
-#include "optlist.h"
+
+static void pr_accept(natid, natid);
 
 /*
- * report rejection status of telegrams and treaties.
+ * report rejection status
  * Optional argument reports staus from the
  * viewpoint of another country
  */
@@ -51,40 +48,41 @@ acce(void)
     struct natstr *np;
     natid cn;
     natid as;
-    int n;
 
-    if (player->argp[1] == 0)
-       as = player->cnum;
-    else {
-       if ((n = natarg(player->argp[1], "Which country? ")) < 0) {
-           pr("Bad country number\n");
+    if (!player->argp[1]) {
+       natp = getnatp(player->cnum);
+    } else {
+       if (!(natp = natargp(player->argp[1], NULL)))
            return RET_SYN;
-       }
-       as = (natid)n;
-    }
-    if ((natp = getnatp(as)) == 0) {
-       pr("Bad country number %d\n", player->cnum);
-       return RET_SYN;
     }
+    as = natp->nat_cnum;
     pr("\t%s Acceptance Status Report\t", cname(as));
     prdate();
-    pr("\n  Acceptance status          %5s                theirs\n",
-       player->cnum == as ? "yours" : " his");
-    pr("                       tel trty anno loan   tel trty anno loan\n");
-    for (cn = 1; cn < MAXNOC; cn++) {
-       if ((np = getnatp(cn)) == 0)
-           break;
+    pr("\n  Acceptance status       %s           theirs\n",
+       player->cnum == as ? "yours" : " his ");
+    pr("                       tel anno loan   tel anno loan\n");
+    for (cn = 0; cn < MAXNOC; cn++) {
        if (cn == as)
            continue;
-       if ((np->nat_stat & STAT_NORM) == 0 &&
-           (np->nat_stat & STAT_SANCT) == 0)
+       if (!(np = getnatp(cn)))
+           break;
+       if (np->nat_stat == STAT_UNUSED)
            continue;
-       if (opt_HIDDEN) {
-           if (!player->god && !getcontact(getnatp(player->cnum), cn))
-               continue;
-       }
-       pr("%3d) %-14.14s  ", cn, cname(cn));
-       pr("%-9s %s\n", rejectname(natp, cn), rejectname(np, as));
+       pr("%3d) %-14.14s ", cn, cname(cn));
+       pr_accept(as, cn);
+       pr_accept(cn, as);
+       pr("\n");
     }
     return RET_OK;
 }
+
+static void
+pr_accept(natid to, natid from)
+{
+    static char *yes_no[] = { "YES", " NO" };
+
+    pr("   %s  %s  %s",
+       yes_no[!nat_accepts(to, from, REJ_TELE)],
+       yes_no[!nat_accepts(to, from, REJ_ANNO)],
+       yes_no[!nat_accepts(to, from, REJ_LOAN)]);
+}