]> git.pond.sub.org Git - empserver/blobdiff - src/lib/subs/lndsub.c
Use relations_with() for US==THEM || getrel(getnatp(US), THEM)
[empserver] / src / lib / subs / lndsub.c
index 565fd91233df74bce6879e6ed56fbd760a04581b..c6bc433607feb1551e12df973ae8273a68562f00 100644 (file)
@@ -51,7 +51,7 @@
 #include "empobj.h"
 #include "unit.h"
 
-static void lnd_mess(char *, struct ulist *);
+static void lnd_stays(natid, char *, struct ulist *);
 static int lnd_hit_mine(struct lndstr *);
 static int has_helpful_engineer(coord, coord, natid);
 
@@ -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;
@@ -485,29 +484,28 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
            continue;
        }
        if (land.lnd_ship >= 0) {
-           lnd_mess("is on a ship", llp);
+           lnd_stays(actor, "is on a ship", llp);
            continue;
        }
        if (land.lnd_land >= 0) {
-           lnd_mess("is on a unit", llp);
+           lnd_stays(actor, "is on a unit", llp);
            continue;
        }
        if (!getsect(land.lnd_x, land.lnd_y, &sect)) {
-           lnd_mess("was sucked into the sky by a strange looking spaceland", llp);    /* heh -KHS */
+           lnd_stays(actor, "was sucked into the sky by a strange looking spaceland", llp);    /* heh -KHS */
            continue;
        }
        if (!(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY) &&
            !(lchr[(int)llp->unit.land.lnd_type].l_flags & L_TRAIN) &&
            llp->unit.land.lnd_item[I_MILIT] == 0) {
-           lnd_mess("has no mil on it to guide it", llp);
+           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 (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));
-           lnd_mess(mess, llp);
+           lnd_stays(actor, mess, llp);
            continue;
        }
        if (first) {
@@ -549,7 +547,7 @@ lnd_sweep(struct emp_qelem *land_list, int verbose, int takemob,
        }
        if (takemob && llp->mobil < 0.0) {
            if (verbose)
-               lnd_mess("is out of mobility", llp);
+               lnd_stays(actor, "is out of mobility", llp);
            continue;
        }
        getsect(llp->unit.land.lnd_x, llp->unit.land.lnd_y, &sect);
@@ -645,12 +643,11 @@ lnd_check_mines(struct emp_qelem *land_list)
 }
 
 static void
-lnd_mess(char *str, struct ulist *llp)
+lnd_stays(natid actor, char *str, struct ulist *llp)
 {
-    mpr(llp->unit.land.lnd_own, "%s %s & stays in %s\n",
-       prland(&llp->unit.land),
-       str, xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y,
-                 llp->unit.land.lnd_own));
+    mpr(actor, "%s %s & stays in %s\n",
+       prland(&llp->unit.land), str,
+       xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, actor));
     if (llp->mobil < -127)
        llp->mobil = -127;
     llp->unit.land.lnd_mobil = llp->mobil;
@@ -776,20 +773,15 @@ 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)) {
        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);
@@ -941,30 +933,31 @@ 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 ||
                               sect.sct_type == SCT_SANCT ||
                               sect.sct_type == SCT_WASTE)) {
            if (together) {
-               pr("can't go to %s\n", xyas(newx, newy, actor));
+               mpr(actor, "can't go to %s\n", xyas(newx, newy, actor));
                return 1;
            } else {
                sprintf(dp, "can't go to %s", xyas(newx, newy, actor));
-               lnd_mess(dp, llp);
+               lnd_stays(actor, dp, llp);
                continue;
            }
        }
        if (!SCT_HAS_RAIL(&sect)
            && lnd_mobtype(&llp->unit.land) == MOB_RAIL) {
            if (together) {
-               pr("no rail system in %s\n", xyas(newx, newy, actor));
+               mpr(actor, "no rail system in %s\n",
+                   xyas(newx, newy, actor));
                return 1;
            } else {
                sprintf(dp, "has no rail system in %s",
                        xyas(newx, newy, actor));
-               lnd_mess(dp, llp);
+               lnd_stays(actor, dp, llp);
                continue;
            }
        }
@@ -985,12 +978,12 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
                    return 1;
            }
            if (stop) {
-               lnd_mess("stops", llp);
+               lnd_stays(actor, "stops", llp);
                continue;
            }
        }
        if (llp->mobil <= 0.0) {
-           lnd_mess("is out of mobility", llp);
+           lnd_stays(actor, "is out of mobility", llp);
            continue;
        }
        llp->unit.land.lnd_x = newx;
@@ -1001,25 +994,25 @@ 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 :) */
-           pr("You no longer own %s\n",
-              xyas(osect.sct_x, osect.sct_y, player->cnum));
+           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 */
            /* Always a 10% chance of getting caught. */
            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));
-                   pr("%s was shot and killed.\n", prland(&llp->unit.land));
+                   mpr(actor, "%s was shot and killed.\n",
+                       prland(&llp->unit.land));
                    llp->unit.land.lnd_effic = 0;
                    putland(llp->unit.land.lnd_uid, &llp->unit.land);
                    lnd_delete(llp);
@@ -1071,16 +1064,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;
@@ -1090,10 +1082,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? */
@@ -1179,7 +1168,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;