Update copyright notice

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

diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index 87f5896a72368327d56031873dfc04677576e588..fecc017bab4f81d9ea8a8d542065af667a38ec7e 100644 (file)
--- a/src/lib/commands/orig.c
+++ b/src/lib/commands/orig.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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,53 +14,70 @@
  *  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.
  *
  *  ---
  *
  *  orig.c: Move your origin
- * 
+ *
  *  Known contributors to this file:
  *     Shelley Louie, 1988
+ *     Markus Armbruster, 2006-2011
  */
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nat.h"
-#include "file.h"
+#include <config.h>
+
+#include <ctype.h>
 #include "commands.h"
 
 int
 orig(void)
 {
-    struct sctstr sect;
-    s_char *p;
+    char *p;
     coord x, y;
-    s_char buf[1024];
+    char buf[1024];
+    int cnum;
     struct natstr *np;
 
-    if ((p =
-        getstarg(player->argp[1], "New origin location : ", buf)) == 0) {
+    p = getstarg(player->argp[1], "New origin (sector or country) : ", buf);
+    if (!p || !*p)
        return RET_SYN;
+    if (!isalpha(*p) && strchr(p, ',')) {
+       /* sector */
+       if (!sarg_xy(p, &x, &y)) {
+           pr("Bad sector designation.\n");
+           return RET_SYN;
+       }
+    } else if (*p == '~') {
+       /* reset */
+       if (!player->god) {
+           pr("Only deities can reset their origin.\n");
+           return RET_FAIL;
+       }
+       x = y = 0;
+    } else {
+       /* country */
+       cnum = natarg(p, NULL);
+       if (!(np = getnatp(cnum)))
+           return RET_SYN;
+       if (!player->god && relations_with(cnum, player->cnum) != ALLIED) {
+           pr("Country %s is not allied with you!\n", np->nat_cnam);
+           return RET_FAIL;
+       }
+       x = np->nat_xorg;
+       y = np->nat_yorg;
     }
-    if (!sarg_xy(p, &x, &y))
-       return RET_SYN;
-    if (!getsect(x, y, &sect))
-       return RET_SYN;
     pr("Origin at %s (old system) is now at 0,0 (new system).\n",
-       xyas(sect.sct_x, sect.sct_y, player->cnum));
+       xyas(x, y, player->cnum));
     np = getnatp(player->cnum);
-    np->nat_xorg = sect.sct_x;
-    np->nat_yorg = sect.sct_y;
+    np->nat_xorg = x;
+    np->nat_yorg = y;
     putnat(np);
     return RET_OK;
 }