Update known contributors comments

[empserver] / src / lib / subs / nreport.c

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index c4def9ac1fb2c1cfd345c74ac8140b73cbec5c8e..13b66d8f859e9f10fd6716c007b9d2e9fc39107d 100644 (file)
--- a/src/lib/subs/nreport.c
+++ b/src/lib/subs/nreport.c
@@ -1,6 +1,6 @@
 /*
  *  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
@@ -26,46 +26,42 @@
  *  ---
  *
  *  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
 
-struct newscache {
-    struct nwsstr news;
-    int id;
-};
-
-static struct newscache cache[MAXNOC][SLOTS];
+static struct nwsstr cache[MAXNOC][SLOTS];
 static int news_tail;
 
-static struct newscache *
-ncache(int actor, int event, int victim, int times);
+static struct nwsstr *ncache(int actor, int event, int victim, int times);
 
 void
 nreport(natid actor, int event, natid victim, int times)
 {
     int nice;
     struct natstr *natp;
-    struct newscache *ncp;
+    struct nwsstr *np;
 
     if (CANT_HAPPEN((unsigned)event > N_MAX_VERB
                    || rpt[event].r_newstory[0] == rpt[0].r_newstory[0]))
        return;
 
-    ncp = ncache(actor, event, victim, times);
-    putnews(ncp->id, &ncp->news);
+    np = ncache(actor, event, victim, times);
+    putnews(np->nws_uid, np);
 
     /*
      * this is probably pretty expensive, but hopefully we
@@ -81,7 +77,7 @@ nreport(natid actor, int event, natid victim, int times)
        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;
@@ -102,7 +98,7 @@ delete_old_news(void)
     /* 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 */
@@ -113,17 +109,19 @@ delete_old_news(void)
 
     /* 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;
+       ef_set_uid(EF_NEWS, &news, j);
        putnews(j, &news);
     }
     CANT_HAPPEN(i + j != news_tail);
     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));
@@ -140,7 +138,7 @@ init_nreport(void)
     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;
@@ -151,10 +149,10 @@ init_nreport(void)
  * in the last 5 minutes, if so just increment the times
  * field instead of creating a new message.
  */
-static struct newscache *
+static struct nwsstr *
 ncache(int actor, int event, int victim, int times)
 {
-    register struct newscache *np;
+    struct nwsstr *np;
     int i;
     int oldslot;
     time_t oldtime;
@@ -164,17 +162,17 @@ ncache(int actor, int event, int victim, int times)
     oldtime = 0x7fffffff;
     for (i = 0; i < SLOTS; i++) {
        np = &cache[actor][i];
-       if (np->news.nws_when < oldtime) {
+       if (np->nws_when < oldtime) {
            oldslot = i;
-           oldtime = np->news.nws_when;
+           oldtime = np->nws_when;
        }
-       if (np->id == 0)
+       if (np->nws_vrb == 0)
            continue;
-       if ((now - np->news.nws_when) > minutes(5))
+       if (now - np->nws_when > 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;
+       if (np->nws_vrb == event && np->nws_vno == victim
+           && np->nws_ntm + times <= 127) {
+           np->nws_ntm += times;
            return np;
        }
     }
@@ -183,12 +181,12 @@ ncache(int actor, int event, int victim, int times)
     if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0))
        victim = 0;
     np = &cache[actor][oldslot];
-    np->news.nws_ano = actor;
-    np->news.nws_vno = victim;
-    np->news.nws_when = now;
-    np->news.nws_vrb = event;
-    np->news.nws_ntm = times;
-    ef_ensure_space(EF_NEWS, news_tail, 100);
-    np->id = news_tail++;
+    ef_blank(EF_NEWS, news_tail, np);
+    np->nws_ano = actor;
+    np->nws_vno = victim;
+    np->nws_when = now;
+    np->nws_vrb = event;
+    np->nws_ntm = times;
+    news_tail++;
     return np;
 }