Update copyright notice

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

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 3395386f1611c3a1594534c2850c29afce9f3907..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
@@ -34,7 +34,7 @@
 
 #include "commands.h"
 
-static void pr_accept(struct natstr *, natid);
+static void pr_accept(natid, natid);
 
 /*
  * report rejection status
@@ -69,21 +69,20 @@ acce(void)
        if (np->nat_stat == STAT_UNUSED)
            continue;
        pr("%3d) %-14.14s ", cn, cname(cn));
-       pr_accept(natp, cn);
-       pr_accept(np, as);
+       pr_accept(as, cn);
+       pr_accept(cn, as);
        pr("\n");
     }
     return RET_OK;
 }
 
 static void
-pr_accept(struct natstr *to, natid from)
+pr_accept(natid to, natid from)
 {
     static char *yes_no[] = { "YES", " NO" };
-    int rej = getrejects(from, to);
 
     pr("   %s  %s  %s",
-       yes_no[(rej & REJ_TELE) != 0],
-       yes_no[(rej & REJ_ANNO) != 0],
-       yes_no[(rej & REJ_LOAN) != 0]);
+       yes_no[!nat_accepts(to, from, REJ_TELE)],
+       yes_no[!nat_accepts(to, from, REJ_ANNO)],
+       yes_no[!nat_accepts(to, from, REJ_LOAN)]);
 }