Update copyright notice

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

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 12bbac58f9cba2803d6cc22e5b08e124c32eacd5..ce781f03946484dfd7d0b3a7208c5d6c562dd732 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-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -24,18 +24,20 @@
  *
  *  ---
  *
- *  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 <config.h>
 
 #include "commands.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
  */
@@ -56,9 +58,9 @@ 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;
@@ -66,8 +68,21 @@ acce(void)
            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("%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)]);
+}