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

Check subscript of rpt[]

Browse source 
Make nws_vrb unsigned to simplify that.
This commit is contained in:
Markus Armbruster 2008-02-24 22:15:10 +01:00
parent 5fda9462bd
commit 990b39edec
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/news.c
View file

@ -85,6 +85,8 @@ news(void)
head();
pr("\nThe details of Empire news since %s", ctime(&then));
while (nxtitem(&nstr, &nws)) {
if (!nws.nws_vrb || CANT_HAPPEN(nws.nws_vrb > N_MAX_VERB))
continue;
if (nws.nws_when < then)
continue;
if (opt_HIDDEN) {
@ -102,6 +104,8 @@ news(void)
pr("\n\t === %s ===\n", page_headings[page].name);
snxtitem_rewind(&nstr);
while (nxtitem(&nstr, &nws)) {
if (CANT_HAPPEN(nws.nws_vrb > N_MAX_VERB))
continue;
if (rpt[(int)nws.nws_vrb].r_newspage != page)
continue;
if (nws.nws_when < then)
@ -191,8 +195,6 @@ preport(struct nwsstr *np)
strcpy(cp, cname(np->nws_ano));
cp += strlen(cp);
*cp++ = ' ';
if (np->nws_vrb < 1 || np->nws_vrb > N_MAX_VERB)
np->nws_vrb = 0;
sprintf(cp, rpt[(int)np->nws_vrb].r_newstory[random() % NUM_RPTS],
cname(np->nws_vno));
cp += strlen(cp);