Update known contributors comments

[empserver] / src / lib / subs / lndsub.c

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index f35116ca6c1843576fea91bf31ecb992b35ce09e..b3483b79bf5f2222ad2286ff3567623f75d04c97 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.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/>.
  *
  *  ---
  *
@@ -30,7 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
@@ -39,17 +38,18 @@
 #include <stdlib.h>
 #include "combat.h"
 #include "damage.h"
+#include "empobj.h"
 #include "file.h"
 #include "misc.h"
 #include "mission.h"
+#include "news.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
 #include "player.h"
 #include "prototypes.h"
-#include "xy.h"
-#include "empobj.h"
 #include "unit.h"
+#include "xy.h"
 
 static void lnd_stays(natid, char *, struct ulist *);
 static int lnd_hit_mine(struct lndstr *);
@@ -501,8 +501,7 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
            lnd_stays(actor, "has no mil on it to guide it", llp);
            continue;
        }
-       if (sect.sct_own != land.lnd_own &&
-           getrel(getnatp(sect.sct_own), actor) != ALLIED &&
+       if (relations_with(sect.sct_own, actor) != ALLIED &&
            !(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) &&
            sect.sct_own) {
            sprintf(mess, "has been kidnapped by %s", cname(sect.sct_own));
@@ -624,10 +623,11 @@ lnd_check_mines(struct emp_qelem *land_list)
        next = qp->q_back;
        llp = (struct ulist *)qp;
        getsect(llp->unit.land.lnd_x, llp->unit.land.lnd_y, &sect);
-       if (sect.sct_oldown == llp->unit.land.lnd_own)
-           continue;
        if (SCT_LANDMINES(&sect) == 0)
            continue;
+       if (relations_with(sect.sct_oldown, llp->unit.land.lnd_own)
+           == ALLIED)
+           continue;
        if (chance(DMINE_LHITCHANCE(sect.sct_mines) / (1 + 2 * with_eng))) {
            lnd_hit_mine(&llp->unit.land);
            sect.sct_mines--;
@@ -782,9 +782,7 @@ lnd_fort_interdiction(struct emp_qelem *list,
     while (nxtsct(&ns, &fsect)) {
        if (fsect.sct_own == 0)
            continue;
-       if (fsect.sct_own == victim)
-           continue;
-       if (getrel(getnatp(fsect.sct_own), victim) >= NEUTRAL)
+       if (relations_with(fsect.sct_own, victim) >= NEUTRAL)
            continue;
        range = roundrange(fortrange(&fsect));
        trange = mapdist(newx, newy, fsect.sct_x, fsect.sct_y);
@@ -936,8 +934,8 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
        newx = xnorm(llp->unit.land.lnd_x + dx);
        newy = ynorm(llp->unit.land.lnd_y + dy);
        getsect(newx, newy, &sect);
-       rel = getrel(getnatp(sect.sct_own), actor);
-       if ((sect.sct_own != actor && rel != ALLIED &&
+       rel = relations_with(sect.sct_own, actor);
+       if ((rel != ALLIED &&
             !(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) &&
             sect.sct_own) || (sect.sct_type == SCT_WATER ||
                               sect.sct_type == SCT_SANCT ||
@@ -1002,7 +1000,7 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
            mpr(actor, "You no longer own %s\n",
                xyas(osect.sct_x, osect.sct_y, actor));
        }
-       if (rel != ALLIED && sect.sct_own != actor && sect.sct_own) {   /* must be a spy */
+       if (rel != ALLIED && sect.sct_own) {    /* must be a spy */
            /* Always a 10% chance of getting caught. */
            if (chance(LND_SPY_DETECT_CHANCE(llp->unit.land.lnd_effic))) {
                if (rel == NEUTRAL || rel == FRIENDLY) {
@@ -1171,7 +1169,7 @@ has_helpful_engineer(coord x, coord y, natid cn)
 
     snxtitem_xy(&ni, EF_LAND, x, y);
     while (nxtitem(&ni, &land)) {
-       if (land.lnd_own != cn && getrel(getnatp(land.lnd_own), cn) != ALLIED)
+       if (relations_with(land.lnd_own, cn) != ALLIED)
            continue;
        if (lchr[(int)land.lnd_type].l_flags & L_ENGINEER)
            return 1;