From 7878e4131f90211570e17df53025a36871d12329 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 31 Oct 2016 10:56:24 +0100 Subject: [PATCH] wire: Fix announcement rejection for and from deities Announcement rejection is completely broken for deities. Additionally, deity announcements aren't exempted from rejection, but that should not normally matter, because the reject command doesn't let you reject deities. Broken when announcements were separated from telegrams in Empire 3. Fix to test the sender's instead of the player's divinity. Signed-off-by: Markus Armbruster --- src/lib/commands/rea.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/commands/rea.c b/src/lib/commands/rea.c index 57d70413..baa103ee 100644 --- a/src/lib/commands/rea.c +++ b/src/lib/commands/rea.c @@ -31,7 +31,7 @@ * Doug Hay, 1998 * Steve McClure, 1998-2000 * Ron Koenderink, 2005-2007 - * Markus Armbruster, 2009-2011 + * Markus Armbruster, 2009-2016 */ #include @@ -107,7 +107,8 @@ rea(void) if (res <= 0) break; if (*kind == 'a') { - if ((!player->god && (getrejects(tgm.tel_from, np) & REJ_ANNO)) + if ((getnatp(tgm.tel_from)->nat_stat != STAT_GOD + && (getrejects(tgm.tel_from, np) & REJ_ANNO)) || tgm.tel_date < then) { res = tel_read_body(telfp, mbox, &tgm, NULL, NULL); if (res < 0)