empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

news: Raise the limit for "number of times" from 127 to 65535

Browse source 
News reporting merges news items into recent items with same contents,
until their count reaches 127.  Raise that limit to 65535, by making
struct nwsstr member nws_ntm unsigned short.  Size of struct nwsstr
stays the same on all common machines.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-27 21:34:42 +02:00
parent 68e595af8a
commit fda2ecb910
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/news.h
View file

@ -30,6 +30,7 @@
* Dave Pare * Dave Pare
* Thomas Ruschak * Thomas Ruschak
* Steve McClure * Steve McClure
* Markus Armbruster, 2004-2016
*/ */
/* /*
@ -47,7 +48,7 @@ struct nwsstr {
natid nws_ano; /* "actor" country # */ natid nws_ano; /* "actor" country # */
unsigned char nws_vrb; /* action (verb) */ unsigned char nws_vrb; /* action (verb) */
natid nws_vno; /* "victim" country # */ natid nws_vno; /* "victim" country # */
signed char nws_ntm; /* number of times */ unsigned short nws_ntm; /* number of times */
short nws_duration; /* last time at nws_when + nws_duration */ short nws_duration; /* last time at nws_when + nws_duration */
time_t nws_when; /* time of action */ time_t nws_when; /* time of action */
}; };

2
src/lib/common/nsc.c
View file

@ -499,7 +499,7 @@ struct castr news_ca[] = {
{"action", fldoff(nws_vrb), NSC_UCHAR, 0, NULL, EF_NEWS_CHR, 0, {"action", fldoff(nws_vrb), NSC_UCHAR, 0, NULL, EF_NEWS_CHR, 0,
CA_DUMP}, CA_DUMP},
{"victim", fldoff(nws_vno), NSC_NATID, 0, NULL, EF_NATION, 0, CA_DUMP}, {"victim", fldoff(nws_vno), NSC_NATID, 0, NULL, EF_NATION, 0, CA_DUMP},
{"times", fldoff(nws_ntm), NSC_CHAR, 0, NULL, EF_BAD, 0, CA_DUMP}, {"times", fldoff(nws_ntm), NSC_USHORT, 0, NULL, EF_BAD, 0, CA_DUMP},
{"duration", fldoff(nws_duration), NSC_SHORT, 0, NULL, EF_BAD, 0, {"duration", fldoff(nws_duration), NSC_SHORT, 0, NULL, EF_BAD, 0,
CA_DUMP}, CA_DUMP},
{"time", fldoff(nws_when), NSC_TIME, 0, NULL, EF_BAD, 0, CA_DUMP}, {"time", fldoff(nws_when), NSC_TIME, 0, NULL, EF_BAD, 0, CA_DUMP},

4
src/lib/subs/nreport.c
View file

@ -30,7 +30,7 @@
* Dave Pare, 1994 * Dave Pare, 1994
* Steve McClure, 1997 * Steve McClure, 1997
* Ron Koenderink, 2005 * Ron Koenderink, 2005
* Markus Armbruster, 2004-2012 * Markus Armbruster, 2004-2016
*/ */
#include <config.h> #include <config.h>
@ -169,7 +169,7 @@ ncache(int actor, int event, int victim, int times)
if (dur > minutes(5)) if (dur > minutes(5))
continue; continue;
if (np->news.nws_vrb == event && np->news.nws_vno == victim && if (np->news.nws_vrb == event && np->news.nws_vno == victim &&
np->news.nws_ntm + times <= 127) { np->news.nws_ntm + times <= 65535) {
np->news.nws_ntm += times; np->news.nws_ntm += times;
np->news.nws_duration = dur; np->news.nws_duration = dur;
return np; return np;