License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index f38e8a6c13439ac273ce745eb69be104629da261..b86701344124fd68341f53a2a25c421d6b8f89a4 100644 (file)
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.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/>.
  *
  *  ---
  *
@@ -173,7 +172,7 @@ sona(void)
            if (rad[y][x] != dchr[SCT_WATER].d_mnem && rad[y][x] != 'X')
                continue;
            if (tmcp->m_flags & M_SUB &&
-               getrel(getnatp(targ.shp_own), player->cnum) < FRIENDLY) {
+               relations_with(targ.shp_own, player->cnum) < FRIENDLY) {
                if (mcp->m_vrnge + visib < 8)
                    pr("Sonar detects sub #%d @ %s\n",
                       targ.shp_uid,
@@ -275,7 +274,7 @@ plane_sona(struct emp_qelem *plane_list, int x, int y,
                pr("Sonar contact in %s\n", xyas(x, y, player->cnum));
                found = 1;
            }
-           if (getrel(getnatp(targ->shp_own), pp->pln_own) < FRIENDLY &&
+           if (relations_with(targ->shp_own, pp->pln_own) < FRIENDLY &&
                roll(100) > pln_identchance(pp, shp_hardtarget(targ),
                                            EF_SHIP))
                if (roll(100) > pln_identchance(pp, shp_hardtarget(targ),