License upgrade to GPL version 3 or later

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

diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index bb45748c31b07b85ba423b1031473a6511bc6903..ece9f503d78a02469b7eb1f4efd7311a47126c55 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, 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/>.
  *
  *  ---
  *
@@ -245,9 +244,9 @@ share_incr(double *res, double *tech)
                    continue;
            }
            if (!opt_ALL_BLEED) {
-               if (getrel(np, j) != ALLIED)
+               if (relations_with(i, j) != ALLIED)
                    continue;
-               if (getrel(other, i) != ALLIED)
+               if (relations_with(j, i) != ALLIED)
                    continue;
                res[i] += levels[j][NAT_RLEV];
                tech[i] += levels[j][NAT_TLEV];