Eliminate a few pointless relations variables

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

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index e4713db3beaa63b6dd1efad757a0c96cf75c6ddb..f35116ca6c1843576fea91bf31ecb992b35ce09e 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -468,7 +468,6 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
     coord ally;
     int first = 1;
     char mess[128];
-    int rel;
 
     *minmobp = 9876.0;
     *maxmobp = -9876.0;
@@ -502,8 +501,8 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
            lnd_stays(actor, "has no mil on it to guide it", llp);
            continue;
        }
-       rel = getrel(getnatp(sect.sct_own), player->cnum);
-       if (sect.sct_own != land.lnd_own && rel != ALLIED &&
+       if (sect.sct_own != land.lnd_own &&
+           getrel(getnatp(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));
@@ -775,12 +774,9 @@ lnd_fort_interdiction(struct emp_qelem *list,
     struct nstr_sect ns;
     struct sctstr fsect;
     int trange, range;
-    double guneff;
-    int shell, gun;
     int dam;
     int stopping = 0;
     int totdam = 0;
-    int i;
 
     snxtsct_dist(&ns, newx, newy, fort_max_interdiction_range);
     while (nxtsct(&ns, &fsect)) {
@@ -940,7 +936,7 @@ 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), player->cnum);
+       rel = getrel(getnatp(sect.sct_own), actor);
        if ((sect.sct_own != actor && rel != ALLIED &&
             !(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) &&
             sect.sct_own) || (sect.sct_type == SCT_WATER ||
@@ -1001,7 +997,7 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
        putland(llp->unit.land.lnd_uid, &llp->unit.land);
        putsect(&osect);
        getsect(osect.sct_x, osect.sct_y, &osect);
-       if (osect.sct_own != oldown && oldown == player->cnum) {
+       if (osect.sct_own != oldown && oldown == actor) {
            /* It was your sector, now it's not.  Simple :) */
            mpr(actor, "You no longer own %s\n",
                xyas(osect.sct_x, osect.sct_y, actor));
@@ -1011,13 +1007,12 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
            if (chance(LND_SPY_DETECT_CHANCE(llp->unit.land.lnd_effic))) {
                if (rel == NEUTRAL || rel == FRIENDLY) {
                    wu(0, sect.sct_own,
-                      "%s unit spotted in %s\n", cname(player->cnum),
+                      "%s unit spotted in %s\n", cname(actor),
                       xyas(sect.sct_x, sect.sct_y, sect.sct_own));
                    setrel(sect.sct_own, llp->unit.land.lnd_own, HOSTILE);
-               } else if (rel == HOSTILE || rel == AT_WAR ||
-                          rel == SITZKRIEG || rel == MOBILIZATION) {
+               } else if (rel <= HOSTILE) {
                    wu(0, sect.sct_own,
-                      "%s spy shot in %s\n", cname(player->cnum),
+                      "%s spy shot in %s\n", cname(actor),
                       xyas(sect.sct_x, sect.sct_y, sect.sct_own));
                    mpr(actor, "%s was shot and killed.\n",
                        prland(&llp->unit.land));
@@ -1072,16 +1067,15 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
 }
 
 /*
- * find all artillery units belonging
- * to the attacker or defender that can fire.
- * Each arty unit adds +1%/damage point
+ * Fire land unit support against VICTIM for ATTACKER, at X,Y.
+ * If DEFENDING, this is defensive support, else offensive support.
+ * Return total damage.
  */
 int
 lnd_support(natid victim, natid attacker, coord x, coord y, int defending)
 {
     struct nstr_item ni;
     struct lndstr land;
-    int rel, rel2;
     int dam, dam2;
     int dist;
     int range;
@@ -1091,10 +1085,7 @@ lnd_support(natid victim, natid attacker, coord x, coord y, int defending)
     while (nxtitem(&ni, &land)) {
        if ((land.lnd_x == x) && (land.lnd_y == y))
            continue;
-       rel = getrel(getnatp(land.lnd_own), attacker);
-       rel2 = getrel(getnatp(land.lnd_own), victim);
-       if ((land.lnd_own != attacker) &&
-           ((rel != ALLIED) || (rel2 != AT_WAR)))
+       if (!feels_like_helping(land.lnd_own, attacker, victim))
            continue;
 
        /* are we in range? */