Record news more compactly

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

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index e1ab70b315a972b2796de568cf72695ea23cfb2c..cfb5641bdac625c3bc75d2f378125a7258b26fc9 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-2008, 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,11 +26,12 @@
  *  ---
  *
  *  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>
@@ -82,7 +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)
+    if (!(natp = getnatp(victim)))
        return;
     if (getrel(natp, actor) < HOSTILE)
        return;
@@ -103,7 +104,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 */
@@ -114,9 +115,8 @@ 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;
-       news.nws_uid = j;
        putnews(j, &news);
     }
     CANT_HAPPEN(i + j != news_tail);
@@ -143,7 +143,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;
@@ -160,7 +160,7 @@ ncache(int actor, int event, int victim, int times)
     struct newscache *np;
     int i;
     int oldslot;
-    time_t oldtime;
+    time_t oldtime, dur;
     time_t now = time(NULL);
 
     oldslot = -1;
@@ -171,13 +171,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;
        }
     }
@@ -188,10 +190,11 @@ ncache(int actor, int event, int victim, int times)
     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;
+    np->news.nws_duration = 0;
+    np->news.nws_when = now;
     np->id = news_tail++;
     return np;
 }