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 96ca6b0eb890719e6b6e141a37f5c750a445ec85..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-2006, 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,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,9 +25,11 @@
  *  ---
  *
  *  nat.c: Misc. accesses on the nation file
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
+ *     Ron Koenderink, 2005
+ *     Markus Armbruster, 2006-2011
  */
 
 #include <config.h>
@@ -40,8 +41,7 @@
 
 char *relates[] = {
     /* must follow nation relation defines in nat.h */
-    "At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
-    "Allied"
+    "At War", "Hostile", "Neutral", "Friendly", "Allied"
 };
 
 char *
@@ -49,8 +49,8 @@ cname(natid n)
 {
     struct natstr *np;
 
-    if ((np = getnatp(n)) == 0)
-       return 0;
+    if (!(np = getnatp(n)))
+       return NULL;
     return np->nat_cnam;
 }
 
@@ -103,6 +103,16 @@ 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)
 {
@@ -139,7 +149,7 @@ putreject(struct natstr *np, natid them, int how, int what)
     if (how)
        np->nat_rejects[them] |= what;
     else
-       np->nat_rejects[them] &= what;
+       np->nat_rejects[them] &= ~what;
 }
 
 void