From 36fa303f492e7a79d33c795e5f5800b2e5e46c69 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 31 Oct 2016 10:20:30 +0100 Subject: [PATCH] reject: Exempt bulletins on relation change with deity Bulletins notifying on a relations change can be rejected just like a telegram from the country initiating the change, except for one inconsistency: telegrams from deities are exempt, but bulletins on a relation change by a deity aren't. Inconsistent since rejecting was added in Merc Empire. Change setrel() to treat relation change bulletins the same as tele() treats telegrams. Should not normally matter, because the reject command doesn't let you reject deities. Signed-off-by: Markus Armbruster --- src/lib/subs/rej.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index 285d2b9f..279ea36f 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -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 (!(getrejects(us, themnp) & REJ_TELE)) + if (mynp->nat_stat == STAT_GOD || !(getrejects(us, themnp) & REJ_TELE)) mpr(them, "Country %s has %s their relations with you to \"%s\"!\n", prnat(mynp), whichway, relates[rel]);