Update copyright notice

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

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 03e2c0c8d0350e694037651fa1bdcbaa3f28f367..7118419c9ecbc07f3dcb4a203f39beb028e81f76 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -27,13 +27,15 @@
  *  acce.c: Report rejection status of telegrams/annos/loans
  *
  *  Known contributors to this file:
- *
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
 
 #include "commands.h"
 
+static void pr_accept(natid, natid);
+
 /*
  * report rejection status
  * Optional argument reports staus from the
@@ -42,17 +44,6 @@
 int
 acce(void)
 {
-    static char *rejects[] = {
-       /* must follow reject flags defined in nat.h */
-       "  YES  YES  YES",
-       "  NO   YES  YES",
-       "  YES  NO   YES",
-       "  NO   NO   YES",
-       "  YES  YES  NO ",
-       "  NO   YES  NO ",
-       "  YES  NO   NO ",
-       "  NO   NO   NO ",
-    };
     struct natstr *natp;
     struct natstr *np;
     natid cn;
@@ -77,10 +68,21 @@ acce(void)
            break;
        if (np->nat_stat == STAT_UNUSED)
            continue;
-       pr("%3d) %-14.14s  ", cn, cname(cn));
-       pr("%s %s\n",
-          rejects[getrejects(cn, natp)],
-          rejects[getrejects(as, np)]);
+       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)]);
+}