Clean up dead stores

[empserver] / src / lib / commands / head.c

diff --git a/src/lib/commands/head.c b/src/lib/commands/head.c
index e562b22e017d52b8b42c243941bd7b6ec79d87bb..5f7ab0310f772cdf2bb7d7a215a6394bc6087155 100644 (file)
--- a/src/lib/commands/head.c
+++ b/src/lib/commands/head.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-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,9 @@
  *  ---
  *
  *  head.c: Print headlines of the Empire News
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
@@ -68,7 +68,7 @@ head(void)
 
     (void)time(&now);
     natp = getnatp(player->cnum);
-    if (player->argp[1] != 0 && *player->argp[1] != 0) {
+    if (player->argp[1] && *player->argp[1]) {
        news_per = days(atoi(player->argp[1]));
        if (news_per > days(3))
            news_per = days(3);
@@ -84,6 +84,8 @@ head(void)
     snxtitem_all(&nstr, EF_NEWS);
     maxcnum = 0;
     while (nxtitem(&nstr, &news)) {
+       if (!news.nws_vrb || CANT_HAPPEN(news.nws_vrb > N_MAX_VERB))
+           continue;
        news_age = now - news.nws_when;
        if (news_age > news_per)
            continue;
@@ -103,7 +105,7 @@ head(void)
     for (n = 0; n < 5; n++) {
        if ((scoop = head_findscoop(hist, maxcnum, &actor, &victim)) < 10)
            break;
-       severity = head_printscoop(hist, actor, victim);
+       head_printscoop(hist, actor, victim);
        hp = &hist[actor][victim];
        severity = hp->h_recent - hp->h_past;
        if (severity <= -scoop / 2 || severity >= scoop / 2) {