Update copyright notice

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

diff --git a/src/lib/commands/mora.c b/src/lib/commands/mora.c
index 09271a7b3331c1739242e4ff1d4b3228bb5f90b5..45e57fd38e7bb6bf87b8a654b85a410ea9004bf0 100644 (file)
--- a/src/lib/commands/mora.c
+++ b/src/lib/commands/mora.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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/>.
  *
  *  ---
  *
@@ -26,21 +25,15 @@
  *  ---
  *
  *  mora.c: Edit morale of a land unit
- * 
+ *
  *  Known contributors to this file:
  *     Jeff Bailey
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
 
 int
@@ -50,13 +43,13 @@ morale(void)
     struct lndstr land;
     struct natstr *natp;
     int i, min;
-    s_char *p;
-    s_char mess[128];
-    s_char buf[1024];
+    char *p;
+    char mess[128];
+    char buf[1024];
 
-    if (!snxtitem(&np, EF_LAND, player->argp[1]))
+    if (!snxtitem(&np, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
-    while (!player->aborted && nxtitem(&np, &land)) {
+    while (nxtitem(&np, &land)) {
        if (!player->owner || land.lnd_own == 0)
            continue;
        natp = getnatp(land.lnd_own);
@@ -64,11 +57,11 @@ morale(void)
        sprintf(mess, "New retreat percentage for %s (min %d%%)? ",
                prland(&land), min);
        p = getstarg(player->argp[2], mess, buf);
+       if (!p)
+           return RET_FAIL;
        if (!check_land_ok(&land))
            continue;
-       if (player->aborted)
-           continue;
-       if (!p || (i = atoi(p)) < 0)
+       if ((i = atoi(p)) < 0)
            continue;
        land.lnd_retreat = ((i < min) ? min : i);
        if (land.lnd_retreat > 100)