empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reject: Replace getrejects() by nat_accepts()

Browse source 
All callers of getrejects() also check whether the sender is a deity.
Factor out the common code into nat_accepts(), and drop getrejects().

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 11:39:05 +01:00
parent 5983fa2f6c
commit 9d153f547c
8 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/subs/rej.c
View file

@ -88,7 +88,7 @@ setrel(natid us, natid them, int rel)
pr("%s\n", addendum);
mpr(us, "Diplomatic relations with %s %s to \"%s\".\n",
cname(them), whichway, relates[rel]);
if (mynp->nat_stat == STAT_GOD || !(getrejects(us, themnp) & REJ_TELE))
if (nat_accepts(themnp, us, REJ_TELE))
mpr(them,
"Country %s has %s their relations with you to \"%s\"!\n",
prnat(mynp), whichway, relates[rel]);