Update known contributors comments

[empserver] / src / lib / common / nat.c

diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c
index 55940b32538a7b2255e61782e78431d5d0c0d2a7..90953b411dce645715ff5853e9f6527dd9ee556e 100644 (file)
--- a/src/lib/common/nat.c
+++ b/src/lib/common/nat.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,55 +14,56 @@
  *  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.
  *
  *  ---
  *
  *  nat.c: Misc. accesses on the nation file
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
+ *     Ron Koenderink, 2005
+ *     Markus Armbruster, 2006-2011
  */
 
-#include "prototypes.h"
+#include <config.h>
+
+#include "file.h"
 #include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "optlist.h"
+#include "sect.h"
 
-s_char *relates[] = {
+char *relates[] = {
     /* must follow nation relation defines in nat.h */
-    "At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
-    "Allied"
+    "At War", "Hostile", "Neutral", "Friendly", "Allied"
 };
 
-s_char *
+char *
 cname(natid n)
 {
     struct natstr *np;
 
-    if ((np = getnatp(n)) == 0)
-       return 0;
+    if (!(np = getnatp(n)))
+       return NULL;
     return np->nat_cnam;
 }
 
-s_char *
+char *
 relatename(struct natstr *np, natid other)
 {
     return relates[getrel(np, other)];
 }
 
-s_char *
+char *
 rejectname(struct natstr *np, natid other)
 {
-    s_char *rejects[] = {
+    static char *rejects[] = {
        /* must follow reject flags defined in nat.h */
        "  YES  YES  YES  YES",
        "  NO   YES  YES  YES",
@@ -85,16 +86,14 @@ rejectname(struct natstr *np, natid other)
     return rejects[getrejects(other, np)];
 }
 
-s_char *
+char *
 natstate(struct natstr *np)
 {
-    if ((np->nat_stat & STAT_INUSE) == 0)
-       return "FREE";
-    if (np->nat_stat & STAT_GOD)
-       return "DEITY";
-    if ((np->nat_stat & STAT_NORM) == 0)
-       return "VISITOR";
-    return "ACTIVE";
+    static char *stnam[] = {
+       /* must match nat_status */
+       "FREE", "VISITOR", "VISITOR", "SANCTUARY", "ACTIVE", "DEITY"
+    };
+    return stnam[np->nat_stat];
 }
 
 /* This returns the relations that np has with them */
@@ -104,17 +103,20 @@ getrel(struct natstr *np, natid them)
     return np->nat_relate[them];
 }
 
+/*
+ * Return relations US has with THEM.
+ * Countries are considered allied to themselves.
+ */
+int
+relations_with(natid us, natid them)
+{
+    return us == them ? ALLIED : getrel(getnatp(us), them);
+}
+
 int
 getrejects(natid them, struct natstr *np)
 {
-    int ind;
-    int shift;
-    int reject;
-
-    ind = them / 4;
-    shift = 12 - ((them - ((them / 4) << 2)) * 4);
-    reject = (np->nat_rejects[ind] >> shift) & 0x0f;
-    return reject;
+    return np->nat_rejects[them];
 }
 
 void
@@ -144,19 +146,10 @@ putrel(struct natstr *np, natid them, int relate)
 void
 putreject(struct natstr *np, natid them, int how, int what)
 {
-    int shift;
-    int newrej;
-    int ind;
-
-    what &= 0x0f;
-    ind = them / 4;
-    shift = 12 - ((them - ((them / 4) << 2)) * 4);
-    newrej = np->nat_rejects[ind];
     if (how)
-       newrej |= (what << shift);
+       np->nat_rejects[them] |= what;
     else
-       newrej &= ~(what << shift);
-    np->nat_rejects[ind] = newrej;
+       np->nat_rejects[them] &= ~what;
 }
 
 void
@@ -178,7 +171,7 @@ influx(struct natstr *np)
 
     getsect(np->nat_xcap, np->nat_ycap, &sect);
     if (sect.sct_own != np->nat_cnum ||
-       (sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT &&\r
+       (sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT &&
         sect.sct_type != SCT_SANCT) ||
        (np->nat_flags & NF_SACKED))
        return 1;