Update copyright notice

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

diff --git a/src/lib/commands/capi.c b/src/lib/commands/capi.c
index c3fa843bc61a3abb841f83ee328e8496948a86bb..3aa5650fc87b050624a4113c07d3c5ae7051ea73 100644 (file)
--- a/src/lib/commands/capi.c
+++ b/src/lib/commands/capi.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2013
  */
 
 #include <config.h>
@@ -38,22 +39,23 @@
 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;
+    }
+    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",