Update copyright notice

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

diff --git a/src/lib/commands/army.c b/src/lib/commands/army.c
index e5e087cf84b13da4053eba149e2d5c84d454c1fb..1aa2cb19ed1f0146eade05c8101698703cbfd56e 100644 (file)
--- a/src/lib/commands/army.c
+++ b/src/lib/commands/army.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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,75 +14,74 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  army.c: Add units to an army
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
+#include <config.h>
+
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
 #include "commands.h"
+#include "land.h"
 
 int
 army(void)
 {
-       struct  lndstr land;
-       register int count;
-       s_char  *cp;
-       s_char  c;
-       struct  nstr_item nstr;
-       struct  nstr_item ni;
-       struct  lndstr land2;
-       int     r;
-       s_char  buf[1024];
+    struct lndstr land;
+    int count;
+    char *cp;
+    char c;
+    struct nstr_item nstr;
+    struct nstr_item ni;
+    struct lndstr land2;
+    char buf[1024];
 
-       cp = getstarg(player->argp[1], "army? ", buf);
-       if (cp == 0)
-               return RET_SYN;
-       c = *cp;
-       if (!isalpha(c) && c != '~') {
-               pr("Specify army, (1 alpha char or '~')\n");
-               return RET_SYN;
-       }
-       if (c == '~')
-               c = ' ';
-       if (!snxtitem(&nstr, EF_LAND, player->argp[2]))
-               return RET_SYN;
-       count = 0;
-       while (nxtitem(&nstr, (s_char *)&land)) {
-               if (!player->owner)
-                       continue;
-               land.lnd_army = c;
-               snxtitem(&ni, EF_LAND, cp);
-               while ((r=nxtitem(&ni, (s_char *)&land2)) &&
-                   (land2.lnd_army != c))
-                       ;
-               if (r){
-                       bcopy(land2.lnd_rpath, land.lnd_rpath,10);
-                       land.lnd_rflags = land2.lnd_rflags;
-               }
-               putland(land.lnd_uid, &land);
-               count++;
+    cp = getstarg(player->argp[1], "army? ", buf);
+    if (!cp)
+       return RET_SYN;
+    c = *cp;
+    if (!isalpha(c) && c != '~') {
+       pr("Specify army, (1 alpha char or '~')\n");
+       return RET_SYN;
+    }
+    if (c == '~')
+       c = 0;
+    if (!snxtitem(&nstr, EF_LAND, player->argp[2], NULL))
+       return RET_SYN;
+    count = 0;
+    while (nxtitem(&nstr, &land)) {
+       if (!player->owner)
+           continue;
+       if (land.lnd_army == c)
+           continue;
+       land.lnd_rflags &= ~RET_GROUP;
+       snxtitem_group(&ni, EF_LAND, c);
+       while (nxtitem(&ni, &land2)) {
+           if ((land2.lnd_rflags & RET_GROUP) == 0)
+               continue;
+           if (land2.lnd_x == land.lnd_x && land2.lnd_y == land.lnd_y) {
+               memcpy(land.lnd_rpath, land2.lnd_rpath,
+                      sizeof(land.lnd_rpath));
+               land.lnd_rflags = land2.lnd_rflags;
+               break;
+           }
        }
-       pr("%d unit%s added to army `%c'\n", count, splur(count), c);
-       return RET_OK;
+       land.lnd_army = c;
+       putland(land.lnd_uid, &land);
+       count++;
+    }
+    pr("%d unit%s added to army `%1.1s'\n", count, splur(count), &c);
+    return RET_OK;
 }