License upgrade to GPL version 3 or later

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

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index 0bce946221c4aced961b26865487beda8370893c..206e56997c46b7bab946c3fcfff67bded6c4d2f5 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-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/>.
  *
  *  ---
  *
@@ -31,7 +30,7 @@
  *     Dave Pare, 1994
  *     Steve McClure, 1997
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
@@ -44,24 +43,31 @@
 
 #define SLOTS  5
 
-static struct nwsstr cache[MAXNOC][SLOTS];
+struct newscache {
+    struct nwsstr news;
+    int id;
+};
+
+static struct newscache cache[MAXNOC][SLOTS];
 static int news_tail;
 
-static struct nwsstr *ncache(int actor, int event, int victim, int times);
+static struct newscache *
+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 nwsstr *np;
+    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;
 
-    np = ncache(actor, event, victim, times);
-    putnews(np->nws_uid, np);
+    ncp = ncache(actor, event, victim, times);
+    putnews(ncp->id, &ncp->news);
 
     /*
      * this is probably pretty expensive, but hopefully we
@@ -77,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);
@@ -111,7 +115,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);
@@ -149,30 +152,32 @@ init_nreport(void)
  * in the last 5 minutes, if so just increment the times
  * field instead of creating a new message.
  */
-static struct nwsstr *
+static struct newscache *
 ncache(int actor, int event, int victim, int times)
 {
-    struct nwsstr *np;
+    struct newscache *np;
     int i;
     int oldslot;
-    time_t oldtime;
+    time_t oldtime, dur;
     time_t now = time(NULL);
 
     oldslot = -1;
     oldtime = 0x7fffffff;
     for (i = 0; i < SLOTS; i++) {
        np = &cache[actor][i];
-       if (np->nws_when < oldtime) {
+       if (np->news.nws_when < oldtime) {
            oldslot = i;
-           oldtime = np->nws_when;
+           oldtime = np->news.nws_when;
        }
-       if (np->nws_vrb == 0)
+       if (np->news.nws_vrb == 0)
            continue;
-       if (now - np->nws_when > minutes(5))
+       dur = now - np->news.nws_when;
+       if (dur > minutes(5))
            continue;
-       if (np->nws_vrb == event && np->nws_vno == victim
-           && np->nws_ntm + times <= 127) {
-           np->nws_ntm += times;
+       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;
        }
     }
@@ -181,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);
-    np->nws_ano = actor;
-    np->nws_vno = victim;
-    np->nws_when = now;
-    np->nws_vrb = event;
-    np->nws_ntm = times;
-    news_tail++;
+    ef_blank(EF_NEWS, news_tail, &np->news);
+    np->news.nws_ano = actor;
+    np->news.nws_vrb = event;
+    np->news.nws_vno = victim;
+    np->news.nws_ntm = times;
+    np->news.nws_duration = 0;
+    np->news.nws_when = now;
+    np->id = news_tail++;
     return np;
 }