/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
*
* Known contributors to this file:
* Steve McClure, 2000
- * Markus Armbruster, 2005-2016
+ * Markus Armbruster, 2005-2021
*/
#include <config.h>
char box[1024];
struct player *other;
- if (type == TEL_ANNOUNCE)
+ if (type == TEL_ANNOUNCE) {
strcpy(box, annfil);
- else
+ np = NULL;
+ } else {
mailbox(box, to);
-
- if (type != TEL_ANNOUNCE)
- if (!(np = getnatp(to)) || np->nat_stat < STAT_SANCT)
+ np = getnatp(to);
+ if (!np || np->nat_stat < STAT_SANCT)
return -1;
+ }
+
#if !defined(_WIN32)
if ((fd = open(box, O_WRONLY | O_APPEND, 0)) < 0) {
#else
for (to = 0; NULL != (np = getnatp(to)); to++) {
if (np->nat_stat < STAT_SANCT)
continue;
- if (!nat_accepts(np, from, REJ_ANNO))
+ if (!nat_accepts(to, from, REJ_ANNO))
continue;
if (!np->nat_ann || !tel.tel_cont) {
np->nat_ann++;