Update copyright notice

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

diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c
index f7e2b8a7c6c29f656fc9bc0bea8c1421aa73b057..0cd7ad032978916c1f9c22be58b0fcdd53bb9ae6 100644 (file)
--- a/src/lib/commands/shoo.c
+++ b/src/lib/commands/shoo.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -33,11 +32,11 @@
 
 #include <config.h>
 
+#include "chance.h"
 #include "commands.h"
 #include "item.h"
 #include "land.h"
 #include "news.h"
-#include "path.h"
 
 int
 shoo(void)
@@ -57,14 +56,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)