Update copyright notice

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

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index 2d92aa8a132ebbfe5604605c956c6dd8783813d4..b1b6e93b6103fb8c1e581823fc27e286eeb96137 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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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/>.
  *
  *  ---
  *
@@ -31,18 +30,19 @@
  *     Dave Pare, 1994
  *     Steve McClure, 1997
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "file.h"
 #include "nat.h"
 #include "news.h"
 #include "optlist.h"
 #include "prototypes.h"
 
-#define SLOTS  5
+#define SLOTS 8
 
 struct newscache {
     struct nwsstr news;
@@ -50,21 +50,22 @@ struct newscache {
 };
 
 static struct newscache cache[MAXNOC][SLOTS];
+static unsigned char cache_oldest[MAXNOC];
 static int news_tail;
 
-static struct newscache *
-ncache(int actor, int event, int victim, int times);
+static struct newscache *ncache(int, int, int, int);
 
 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);
@@ -83,9 +84,7 @@ nreport(natid actor, int event, natid victim, int times)
        return;
     if (!chance((double)-nice * times / 20.0))
        return;
-    if (!(natp = getnatp(victim)))
-       return;
-    if (getrel(natp, actor) < HOSTILE)
+    if (relations_with(victim, actor) < HOSTILE)
        return;
 
     setrel(victim, actor, HOSTILE);
@@ -117,7 +116,6 @@ delete_old_news(void)
     for (j = 0; getnews(i + j, &news); j++) {
        if (news.nws_vrb == 0)
            break;
-       ef_set_uid(EF_NEWS, &news, j);
        putnews(j, &news);
     }
     CANT_HAPPEN(i + j != news_tail);
@@ -160,18 +158,12 @@ ncache(int actor, int event, int victim, int times)
 {
     struct newscache *np;
     int i;
-    int oldslot;
-    time_t oldtime, dur;
+    unsigned oldslot;
+    time_t dur;
     time_t now = time(NULL);
 
-    oldslot = -1;
-    oldtime = 0x7fffffff;
     for (i = 0; i < SLOTS; i++) {
        np = &cache[actor][i];
-       if (np->news.nws_when < oldtime) {
-           oldslot = i;
-           oldtime = np->news.nws_when;
-       }
        if (np->news.nws_vrb == 0)
            continue;
        dur = now - np->news.nws_when;
@@ -184,11 +176,13 @@ ncache(int actor, int event, int victim, int times)
            return np;
        }
     }
-    if (CANT_HAPPEN(oldslot < 0))
-       oldslot = 0;
     if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0))
        victim = 0;
+    oldslot = cache_oldest[actor];
+    if (CANT_HAPPEN(oldslot >= SLOTS))
+       oldslot = 0;
     np = &cache[actor][oldslot];
+    cache_oldest[actor] = (oldslot + 1) % SLOTS;
     ef_blank(EF_NEWS, news_tail, &np->news);
     np->news.nws_ano = actor;
     np->news.nws_vrb = event;