/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* nreport.c: File a news report. Downgrade relations if things get hostile.
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
* Steve McClure, 1997
* Ron Koenderink, 2005
+ * Markus Armbruster, 2004-2009
*/
#include <config.h>
-#include "prototypes.h"
-#include "news.h"
#include "file.h"
+#include "nat.h"
+#include "news.h"
#include "optlist.h"
+#include "prototypes.h"
#define SLOTS 5
return;
if (!chance((double)-nice * times / 20.0))
return;
- if ((natp = getnatp(victim)) == 0)
+ if (!(natp = getnatp(victim)))
return;
if (getrel(natp, actor) < HOSTILE)
return;
/* skip over expired news */
expiry_time = time(NULL) - days(news_keep_days);
for (i = 0; getnews(i, &news); i++) {
- if (news.nws_when == 0 || news.nws_when >= expiry_time)
+ if (news.nws_vrb == 0 || news.nws_when >= expiry_time)
break;
}
/* news id 0..I-1 have expired */
/* move unexpired news I.. to 0.., overwriting expired news */
for (j = 0; getnews(i + j, &news); j++) {
- if (news.nws_when == 0)
+ if (news.nws_vrb == 0)
break;
putnews(j, &news);
}
news_tail = j;
/* mark slots no longer in use */
- memset(&news, 0, sizeof(news));
- for (k = 0; k < i; k++)
+ for (k = 0; k < i; k++) {
+ ef_blank(EF_NEWS, j + k, &news);
putnews(j + k, &news);
+ }
/* clear cache because moving news invalidated it */
memset(&cache, 0, sizeof(cache));
struct nwsstr news;
for (newest_item = 0; getnews(newest_item, &news); newest_item++) {
- if (news.nws_when == 0)
+ if (news.nws_vrb == 0)
break;
}
news_tail = newest_item;
static struct newscache *
ncache(int actor, int event, int victim, int times)
{
- register struct newscache *np;
+ struct newscache *np;
int i;
int oldslot;
- time_t oldtime;
+ time_t oldtime, dur;
time_t now = time(NULL);
oldslot = -1;
oldslot = i;
oldtime = np->news.nws_when;
}
- if (np->id == 0)
+ if (np->news.nws_vrb == 0)
continue;
- if ((now - np->news.nws_when) > minutes(5))
+ dur = now - np->news.nws_when;
+ if (dur > minutes(5))
continue;
if (np->news.nws_vrb == event && np->news.nws_vno == victim &&
np->news.nws_ntm + times <= 127) {
np->news.nws_ntm += times;
+ np->news.nws_duration = dur;
return np;
}
}
if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0))
victim = 0;
np = &cache[actor][oldslot];
+ ef_blank(EF_NEWS, news_tail, &np->news);
np->news.nws_ano = actor;
- np->news.nws_vno = victim;
- np->news.nws_when = now;
np->news.nws_vrb = event;
+ np->news.nws_vno = victim;
np->news.nws_ntm = times;
- ef_ensure_space(EF_NEWS, news_tail, 100);
+ np->news.nws_duration = 0;
+ np->news.nws_when = now;
np->id = news_tail++;
return np;
}