Update copyright notice

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

diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index 80340552f08c1ba746c892b513bbc94f7bbe6879..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-2000, 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,101 +14,86 @@
  *  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.
  *
  *  ---
  *
  *  decl.c: Declare war, neutrality, alliance, hostile or friendly
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "news.h"
-#include "file.h"
-#include "deity.h"
-#include "xy.h"
-#include "nsc.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
 
 int
 decl(void)
 {
-       struct  natstr  nat, *natp;
-       int     rel;
-       int     who;
-       struct  nstr_item ni;
-       s_char *p;
-       s_char  buf[1024];
+    struct natstr nat;
+    enum relations rel;
+    int who;
+    struct nstr_item ni;
+    char *p;
+    char buf[1024];
 
-       if (!(p = getstarg(player->argp[1], "alliance, friendly, neutrality, hostility, or war? ", buf)))
-               return RET_SYN;
-       switch (*p) {
-       case 'a':
-               rel = ALLIED;
-               break;
-       case 'f':
-               rel = FRIENDLY;
-               break;
-       case 'n':
-               rel = NEUTRAL;
-               break;
-       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;
-       default:
-               pr("That's no declaration!\n");
-               return RET_SYN;
-       }
+    p = getstarg(player->argp[1],
+                "alliance, friendly, neutrality, hostility, or war? ",
+                buf);
+    if (!p)
+       return RET_SYN;
+    switch (*p) {
+    case 'a':
+       rel = ALLIED;
+       break;
+    case 'f':
+       rel = FRIENDLY;
+       break;
+    case 'n':
+       rel = NEUTRAL;
+       break;
+    case 'h':
+       rel = HOSTILE;
+       break;
+    case 'w':
+       rel = AT_WAR;
+       break;
+    default:
+       pr("That's no declaration!\n");
+       return RET_SYN;
+    }
 
-       if (!snxtitem(&ni, EF_NATION, player->argp[2]))
-               return RET_SYN;
-       who = player->cnum;
-       if (player->god){
-               who = natarg(player->argp[3], "for which country? ");
-               if (who < 0) return RET_SYN;
-       }
-       if (who == 255) return RET_SYN;
+    if (!snxtitem(&ni, EF_NATION, player->argp[2], NULL))
+       return RET_SYN;
+    who = player->cnum;
+    if (player->god) {
+       who = natarg(player->argp[3], "for which country? ");
+       if (who < 0)
+           return RET_SYN;
+    }
 
-       natp = getnatp(who);
-       while (nxtitem(&ni, (s_char *) &nat)) {
-               if (!(nat.nat_stat & STAT_INUSE))
-                       continue;
-               if (player->cnum == (natid)ni.cur)
-                       continue;
-               if (opt_HIDDEN) {
-                   if (!player->god && !getcontact(natp, ni.cur)) {
-                       pr("You haven't contacted country #%d yet\n", ni.cur);
-                       continue;
-                   }
-               }
-               if (getrel(natp, (natid)ni.cur) == rel)
-                       continue;
-               setrel(who, (natid)ni.cur, rel);
+    while (nxtitem(&ni, &nat)) {
+       if (nat.nat_stat == STAT_UNUSED)
+           continue;
+       if (who == (natid)ni.cur)
+           continue;
+       if (opt_HIDDEN) {
+           if (!player->god && !in_contact(who, ni.cur)) {
+               pr("You haven't contacted country #%d yet\n", ni.cur);
+               continue;
+           }
        }
-       return RET_OK;
+       if (relations_with(who, (natid)ni.cur) == rel)
+           continue;
+       setrel(who, (natid)ni.cur, rel);
+    }
+    return RET_OK;
 }