/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2015, 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-2015
+ * Markus Armbruster, 2005-2021
*/
#include <config.h>
#include <stdarg.h>
#include <sys/uio.h>
#include <unistd.h>
-#include "file.h"
#include "misc.h"
#include "nat.h"
#include "optlist.h"
-#include "player.h"
#include "prototypes.h"
-#include "server.h"
#include "tel.h"
+#include "update.h"
static struct telstr last_tel[MAXNOC];
last_tel[to].tel_from = NATID_BAD;
}
-/*
- * telegram_is_new counts new telegrams the same as read_telegrams in
- * lib/commands/mail.c and lib/commands/rea.c
- */
-
static int
telegram_is_new(natid to, struct telstr *tel)
{
if (tel->tel_from != last_tel[to].tel_from
|| tel->tel_type != last_tel[to].tel_type
|| (tel->tel_type != TEL_UPDATE
- && abs(tel->tel_date - last_tel[to].tel_date) > TEL_SECONDS)) {
+ && tel->tel_date - last_tel[to].tel_date > TEL_SECONDS)) {
last_tel[to] = *tel;
return 1;
}
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 (!player->god && (getrejects(from, np) & REJ_ANNO))
+ if (!nat_accepts(to, from, REJ_ANNO))
continue;
if (!np->nat_ann || !tel.tel_cont) {
np->nat_ann++;