Update copyright notice

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

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 72096f320708f1b89c9c6cba992a57617c6be0e8..7924a4939970c2751f8c21acb685ae5ec60a0897 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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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/>.
  *
  *  ---
  *
@@ -25,7 +24,7 @@
  *
  *  ---
  *
- *  acce.c: Report rejection status of telegrams/treaties/annos/loans
+ *  acce.c: Report rejection status of telegrams/annos/loans
  *
  *  Known contributors to this file:
  *
@@ -34,22 +33,32 @@
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 /*
- * report rejection status of telegrams and treaties.
+ * report rejection status
  * Optional argument reports staus from the
  * viewpoint of another country
  */
 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;
     natid as;
 
-    if (player->argp[1] == 0) {
+    if (!player->argp[1]) {
        natp = getnatp(player->cnum);
     } else {
        if (!(natp = natargp(player->argp[1], NULL)))
@@ -58,18 +67,20 @@ acce(void)
     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");
+    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 = getnatp(cn)) == 0)
+       if (!(np = getnatp(cn)))
            break;
        if (np->nat_stat == STAT_UNUSED)
            continue;
        pr("%3d) %-14.14s  ", cn, cname(cn));
-       pr("%-9s %s\n", rejectname(natp, cn), rejectname(np, as));
+       pr("%s %s\n",
+          rejects[getrejects(cn, natp)],
+          rejects[getrejects(as, np)]);
     }
     return RET_OK;
 }