/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2014, 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
* 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"
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)
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;
}