Update copyright notice

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

diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index 4c0c7e52a8fb04b8375d0a62dc0c65b787e43be9..c8e2b4ff246967f2e790c46a34c646ca19bb30eb 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-2006, 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,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,20 +25,15 @@
  *  ---
  *
  *  orig.c: Move your origin
- * 
+ *
  *  Known contributors to this file:
  *     Shelley Louie, 1988
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2011
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nat.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
 
 int
@@ -48,11 +42,11 @@ orig(void)
     char *p;
     coord x, y;
     char buf[1024];
-    natid cnum;
+    int cnum;
     struct natstr *np;
 
     p = getstarg(player->argp[1], "New origin (sector or country) : ", buf);
-    if (!p)
+    if (!p || !*p)
        return RET_SYN;
     if (!isalpha(*p) && strchr(p, ',')) {
        /* sector */
@@ -72,8 +66,7 @@ orig(void)
        cnum = natarg(p, NULL);
        if (!(np = getnatp(cnum)))
            return RET_SYN;
-       if (!player->god && player->cnum != cnum
-           && getrel(np, player->cnum) != ALLIED) {
+       if (!player->god && relations_with(cnum, player->cnum) != ALLIED) {
            pr("Country %s is not allied with you!\n", np->nat_cnam);
            return RET_FAIL;
        }