Update copyright notice

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

diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index 120bb823ebd5b418915ceeb0215cd00c935feabc..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-2008, 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,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,10 +25,10 @@
  *  ---
  *
  *  orig.c: Move your origin
- * 
+ *
  *  Known contributors to this file:
  *     Shelley Louie, 1988
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2011
  */
 
 #include <config.h>
@@ -67,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;
        }