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 5406d2b76435d0ef77f47b21ee4958e658eca5cc..87ac36c69d0092ccaa7a988ba5b6d3363b735f89 100644 (file)
--- a/src/lib/subs/nreport.c
+++ b/src/lib/subs/nreport.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,18 +25,21 @@
  *  ---
  *
  *  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-2011
  */
 
 #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
 
@@ -56,12 +58,13 @@ void
 nreport(natid actor, int event, natid victim, int times)
 {
     int nice;
-    struct natstr *natp;
     struct newscache *ncp;
 
     if (CANT_HAPPEN((unsigned)event > N_MAX_VERB
                    || rpt[event].r_newstory[0] == rpt[0].r_newstory[0]))
        return;
+    if (CANT_HAPPEN(actor >= MAXNOC || victim >= MAXNOC))
+       return;
 
     ncp = ncache(actor, event, victim, times);
     putnews(ncp->id, &ncp->news);
@@ -80,9 +83,7 @@ nreport(natid actor, int event, natid victim, int times)
        return;
     if (!chance((double)-nice * times / 20.0))
        return;
-    if ((natp = getnatp(victim)) == 0)
-       return;
-    if (getrel(natp, actor) < HOSTILE)
+    if (relations_with(victim, actor) < HOSTILE)
        return;
 
     setrel(victim, actor, HOSTILE);
@@ -101,7 +102,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 */
@@ -112,7 +113,7 @@ 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;
        putnews(j, &news);
     }
@@ -120,9 +121,10 @@ delete_old_news(void)
     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));
@@ -139,7 +141,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;
@@ -153,10 +155,10 @@ init_nreport(void)
 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;
@@ -167,13 +169,15 @@ ncache(int actor, int event, int victim, int times)
            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;
        }
     }
@@ -182,12 +186,13 @@ 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];
+    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;
 }