/*
* 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
#include "commands.h"
-static void pr_accept(struct natstr *, natid);
+static void pr_accept(natid, natid);
/*
* report rejection status
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);
- int from_deity = getnatp(from)->nat_stat == STAT_GOD;
pr(" %s %s %s",
- yes_no[!from_deity && (rej & REJ_TELE)],
- yes_no[!from_deity && (rej & REJ_ANNO)],
- yes_no[!from_deity && (rej & REJ_LOAN)]);
+ yes_no[!nat_accepts(to, from, REJ_TELE)],
+ yes_no[!nat_accepts(to, from, REJ_ANNO)],
+ yes_no[!nat_accepts(to, from, REJ_LOAN)]);
}