Update copyright notice

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

diff --git a/src/lib/commands/capi.c b/src/lib/commands/capi.c
index 9f2f3ccdd6f95326ac44e4af4313161baeec9d08..3aa5650fc87b050624a4113c07d3c5ae7051ea73 100644 (file)
--- a/src/lib/commands/capi.c
+++ b/src/lib/commands/capi.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-2021, 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,61 +14,54 @@
  *  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.
  *
  *  ---
  *
  *  capi.c: Move your capital
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2013
  */
 
+#include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
 #include "commands.h"
 
 int
 capi(void)
 {
+    char buf[1024];
+    char *p;
+    coord x, y;
     struct sctstr sect;
     struct natstr *np;
-    struct nstr_sect nstr;
-    int found;
 
-    if (!snxtsct(&nstr, player->argp[1]))
+    if (!(p = getstarg(player->argp[1], "Sector? ", buf)) ||
+       !sarg_xy(p, &x, &y) || !getsect(x, y, &sect))
        return RET_SYN;
-    np = getnatp(player->cnum);
-    found = 0;
-    while (!found && nxtsct(&nstr, &sect)) {
-       if (player->owner && (sect.sct_type == SCT_CAPIT ||
-                             sect.sct_type == SCT_MOUNT))
-           found++;
-    }
-    if (!found)
+    if (!player->owner
+       || (sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT)) {
+       pr("%s is not a %s or %s owned by you.\n",
+          xyas(sect.sct_x, sect.sct_y, player->cnum),
+          dchr[SCT_CAPIT].d_name, dchr[SCT_MOUNT].d_name);
        return RET_FAIL;
-    if (sect.sct_x == np->nat_xcap && sect.sct_y == np->nat_ycap) {
+    }
+    np = getnatp(player->cnum);
+    if (!(np->nat_flags & NF_SACKED) &&
+       sect.sct_x == np->nat_xcap && sect.sct_y == np->nat_ycap) {
        pr("%s is already your capital.\n",
           xyas(sect.sct_x, sect.sct_y, player->cnum));
        return RET_FAIL;
     }
-    player->nstat |= CAP;
     np->nat_xcap = sect.sct_x;
     np->nat_ycap = sect.sct_y;
     /* They have set a capital, so it wasn't sacked last. */