Update copyright notice

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

diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index e438a85a612732f5cd5ae4bade9ff15c741b96de..9192f855d0f8241b769d102d2b35ff797364e8c1 100644 (file)
--- a/src/lib/commands/decl.c
+++ b/src/lib/commands/decl.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-2017, 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,35 +25,30 @@
  *  ---
  *
  *  decl.c: Declare war, neutrality, alliance, hostile or friendly
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
 #include "optlist.h"
 
 int
 decl(void)
 {
-    struct natstr nat, *natp;
-    int rel;
+    struct natstr nat;
+    enum relations rel;
     int who;
     struct nstr_item ni;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
-    if (!(p = getstarg(player->argp[1],
-                      "alliance, friendly, neutrality, hostility, or war? ",
-                      buf)))
+    p = getstarg(player->argp[1],
+                "alliance, friendly, neutrality, hostility, or war? ",
+                buf);
+    if (!p)
        return RET_SYN;
     switch (*p) {
     case 'a':
@@ -69,20 +63,6 @@ decl(void)
     case 'h':
        rel = HOSTILE;
        break;
-    case 'm':
-       if (!opt_SLOW_WAR)
-           return RET_SYN;
-       if (!player->god)
-           return RET_SYN;
-       rel = MOBILIZATION;
-       break;
-    case 's':
-       if (!opt_SLOW_WAR)
-           return RET_SYN;
-       if (!player->god)
-           return RET_SYN;
-       rel = SITZKRIEG;
-       break;
     case 'w':
        rel = AT_WAR;
        break;
@@ -91,7 +71,7 @@ decl(void)
        return RET_SYN;
     }
 
-    if (!snxtitem(&ni, EF_NATION, player->argp[2]))
+    if (!snxtitem(&ni, EF_NATION, player->argp[2], NULL))
        return RET_SYN;
     who = player->cnum;
     if (player->god) {
@@ -100,19 +80,18 @@ decl(void)
            return RET_SYN;
     }
 
-    natp = getnatp(who);
     while (nxtitem(&ni, &nat)) {
        if (nat.nat_stat == STAT_UNUSED)
            continue;
-       if (player->cnum == (natid)ni.cur)
+       if (who == (natid)ni.cur)
            continue;
        if (opt_HIDDEN) {
-           if (!player->god && !getcontact(natp, ni.cur)) {
+           if (!player->god && !in_contact(who, ni.cur)) {
                pr("You haven't contacted country #%d yet\n", ni.cur);
                continue;
            }
        }
-       if (getrel(natp, (natid)ni.cur) == rel)
+       if (relations_with(who, (natid)ni.cur) == rel)
            continue;
        setrel(who, (natid)ni.cur, rel);
     }