Update copyright notice

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

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index 6cd7abd74f7018e45f6138d10def25f0eebef558..7a869d25c7f31ab99078991a52bca7e07b697610 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-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,13 +30,12 @@
  *     Dave Pare, 1994
  *     Steve McClure, 1997
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
 #include "chance.h"
-#include "file.h"
 #include "nat.h"
 #include "news.h"
 #include "optlist.h"
@@ -106,7 +105,7 @@ delete_old_news(void)
        if (news.nws_vrb == 0 || news.nws_when >= expiry_time)
            break;
     }
-    /* news id 0..I-1 have expired */
+    /* news ID 0..I-1 have expired */
     CANT_HAPPEN(i > news_tail);
     /* no items to delete if I is equal zero */
     if (i == 0)
@@ -169,9 +168,9 @@ ncache(int actor, int event, int victim, int times)
        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;
+       if (np->news.nws_vrb == event && np->news.nws_vno == victim) {
+           np->news.nws_ntm = LIMIT_TO(np->news.nws_ntm + times,
+                                       0, 65535);
            np->news.nws_duration = dur;
            return np;
        }