Update copyright notice

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

diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c
index 44fd9fd134d6c3d69713b56d674350d7376598e4..63f3f16f36b099cba6ab16fffbc5b46e4a036c1e 100644 (file)
--- a/src/lib/commands/shoo.c
+++ b/src/lib/commands/shoo.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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,25 +26,18 @@
  *  ---
  *
  *  shoo.c: Shoot some conquered populace or pigeons.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "news.h"
+#include "commands.h"
 #include "item.h"
-#include "path.h"
-#include "nat.h"
-#include "file.h"
-#include "nsc.h"
 #include "land.h"
-#include "commands.h"
+#include "news.h"
+#include "path.h"
 
 int
 shoo(void)
@@ -64,14 +57,14 @@ shoo(void)
     char buf[1024];
 
     ip = whatitem(player->argp[1], "Shoot what <civ or uw> ");
-    if (ip == 0 || (ip->i_uid != I_CIVIL && ip->i_uid != I_UW))
+    if (!ip || (ip->i_uid != I_CIVIL && ip->i_uid != I_UW))
        return RET_SYN;
     item = ip->i_uid;
     if (!snxtsct(&nstr, player->argp[2]))
        return RET_SYN;
     sprintf(prompt, "number of %s to shoot? ", ip->i_name);
     p = getstarg(player->argp[3], prompt, buf);
-    if (p == 0 || (targets = atoi(p)) <= 0)
+    if (!p || (targets = atoi(p)) <= 0)
        return RET_SYN;
     while (nxtsct(&nstr, &sect)) {
        if (!player->owner)
@@ -80,10 +73,10 @@ shoo(void)
        nsec = 0;
        snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y);
        while (nxtitem(&ni, &land)) {
-           mil += total_mil(&land);
+           mil += land.lnd_item[I_MILIT];
 
            if (lchr[(int)land.lnd_type].l_flags & L_SECURITY) {
-               mil += total_mil(&land);
+               mil += land.lnd_item[I_MILIT];
                nsec++;
            }
        }