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

reject: Clean up typed_wu()'s check for deity

Browse source 
When sending a telegram, typed_wu() checks whether the recipient is
rejecting telegrams.  The check tacitly assumes from == player->cnum.
Happens to be the case, but clean it up anyway.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 11:18:02 +01:00
parent 7878e4131f
commit c7cdcfc973
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/wu.c
View file

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Steve McClure, 2000 * Steve McClure, 2000
* Markus Armbruster, 2005-2015 * Markus Armbruster, 2005-2016
*/ */
#include <config.h> #include <config.h>
@ -40,7 +40,6 @@
#include "misc.h" #include "misc.h"
#include "nat.h" #include "nat.h"
#include "optlist.h" #include "optlist.h"
#include "player.h"
#include "prototypes.h" #include "prototypes.h"
#include "tel.h" #include "tel.h"
#include "update.h" #include "update.h"
@ -154,7 +153,8 @@ typed_wu(natid from, natid to, char *message, int type)
for (to = 0; NULL != (np = getnatp(to)); to++) { for (to = 0; NULL != (np = getnatp(to)); to++) {
if (np->nat_stat < STAT_SANCT) if (np->nat_stat < STAT_SANCT)
continue; continue;
if (!player->god && (getrejects(from, np) & REJ_ANNO)) if (getnatp(from)->nat_stat != STAT_GOD
&& (getrejects(from, np) & REJ_ANNO))
continue; continue;
if (!np->nat_ann || !tel.tel_cont) { if (!np->nat_ann || !tel.tel_cont) {
np->nat_ann++; np->nat_ann++;