Update copyright notice

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

diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index 8816de8fcc5bbf701b5945bd260e69d5aee903f8..ea626cfc6a408b0892f855a653d3b3c8dd9b3f43 100644 (file)
--- a/src/lib/commands/decl.c
+++ b/src/lib/commands/decl.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,24 +19,20 @@
  *
  *  ---
  *
- *  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 "file.h"
-#include "xy.h"
-#include "nsc.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
 
@@ -47,12 +43,13 @@ decl(void)
     int 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':
@@ -89,7 +86,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,9 +97,9 @@ decl(void)
 
     natp = getnatp(who);
     while (nxtitem(&ni, &nat)) {
-       if (!(nat.nat_stat & STAT_INUSE))
+       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)) {