]> 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 f9add5cc8c4dc828fb30b5d4fe976dd4baac6556..c6bc433607feb1551e12df973ae8273a68562f00 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -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);
 
@@ -136,19 +136,17 @@ lnd_reaction_range(struct lndstr *lp)
 }
 
 void
-lnd_print(struct ulist *llp, char *s)
+lnd_print(natid actor, struct ulist *llp, char *s)
 {
-    if (llp->unit.land.lnd_own == player->cnum)
+    if (actor == player->cnum)
        pr("%s %s\n", prland(&llp->unit.land), s);
     else
-       wu(0, llp->unit.land.lnd_own, "%s %s\n", prland(&llp->unit.land), s);
+       wu(0, actor, "%s %s\n", prland(&llp->unit.land), s);
 }
 
 void
-lnd_delete(struct ulist *llp, char *s)
+lnd_delete(struct ulist *llp)
 {
-    if (s)
-       lnd_print(llp, s);
     putland(llp->unit.land.lnd_uid, &llp->unit.land);
     emp_remque((struct emp_qelem *)llp);
     free(llp);
@@ -178,10 +176,9 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
 
     taken = llp->unit.land.lnd_item[I_MILIT];
     /* Spies always die */
-    if (((struct lchrstr *)llp->chrp)->l_flags & L_SPY) {
-       eff_eq = 100;
+    if (((struct lchrstr *)llp->chrp)->l_flags & L_SPY)
        llp->unit.land.lnd_effic = 0;
-    else {
+    else {
        eff_eq = ldround(cas * 100.0 /
            ((struct lchrstr *)llp->chrp)->l_item[I_MILIT], 1);
        llp->unit.land.lnd_effic -= eff_eq;
@@ -193,7 +190,8 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
                combat_mode ? att_mode[combat_mode] : "defending",
                xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y,
                     llp->unit.land.lnd_own));
-       lnd_delete(llp, buf);
+       lnd_print(llp->unit.land.lnd_own, llp, buf);
+       lnd_delete(llp);
        /* Since we killed the unit, we killed all the mil on it */
        return taken;
     } else {
@@ -217,7 +215,7 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
     ret_chance = llp->unit.land.lnd_retreat - llp->unit.land.lnd_effic;
     if (roll(100) < ret_chance) {
        pr("\n");
-       lnd_print(llp, "fails morale check!");
+       lnd_print(llp->unit.land.lnd_own, llp, "fails morale check!");
        llp->unit.land.lnd_mission = 0;
        llp->unit.land.lnd_harden = 0;
        if (llp->unit.land.lnd_ship >= 0 || llp->unit.land.lnd_land >= 0)
@@ -269,7 +267,8 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
                sprintf(buf, "retreats at %d%% efficiency to %s!",
                        llp->unit.land.lnd_effic,
                        xyas(bx, by, llp->unit.land.lnd_own));
-               lnd_delete(llp, buf);
+               lnd_print(llp->unit.land.lnd_own, llp, buf);
+               lnd_delete(llp);
            }
        } else {                /* attacking from a sector */
            sprintf(buf, "leaves the battlefield at %d%% efficiency",
@@ -279,7 +278,8 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
            else
                llp->unit.land.lnd_mobil -= (int)llp->mobil;
            llp->mobil = 0.0;
-           lnd_delete(llp, buf);
+           lnd_print(llp->unit.land.lnd_own, llp, buf);
+           lnd_delete(llp);
        }
     }
     if (nowhere_to_go) {
@@ -287,10 +287,12 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
        llp->unit.land.lnd_effic -= 10;
        lnd_submil(&llp->unit.land,
                   ((struct lchrstr *)llp->chrp)->l_item[I_MILIT] / 10);
-       if (llp->unit.land.lnd_effic < LAND_MINEFF)
-           lnd_delete(llp, "has nowhere to retreat, and dies!");
-       else
-           lnd_print(llp,
+       if (llp->unit.land.lnd_effic < LAND_MINEFF) {
+           lnd_print(llp->unit.land.lnd_own, llp,
+                     "has nowhere to retreat, and dies!");
+           lnd_delete(llp);
+       } else
+           lnd_print(llp->unit.land.lnd_own, llp,
                      "has nowhere to retreat and takes extra losses!");
     }
 
@@ -405,7 +407,12 @@ lnd_sel(struct nstr_item *ni, struct emp_qelem *list)
 
     emp_initque(list);
     while (nxtitem(ni, &land)) {
-       if (!player->owner)
+       /*
+        * It would be nice to let deities march foreign land units,
+        * but much of the code assumes that only the land unit's
+        * owner can march it.
+        */
+       if (land.lnd_own != player->cnum)
            continue;
        if (opt_MARKET) {
            if (ontradingblock(EF_LAND, &land)) {
@@ -461,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;
@@ -472,35 +478,34 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
        getland(llp->unit.land.lnd_uid, &land);
        if (land.lnd_own != actor) {
            mpr(actor, "%s was disbanded at %s\n",
-               prland(&land), xyas(land.lnd_x, land.lnd_y, land.lnd_own));
+               prland(&land), xyas(land.lnd_x, land.lnd_y, actor));
            emp_remque((struct emp_qelem *)llp);
            free(llp);
            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) {
@@ -542,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);
@@ -638,18 +643,15 @@ 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;
-    putland(llp->unit.land.lnd_uid, &llp->unit.land);
-    emp_remque((struct emp_qelem *)llp);
-    free(llp);
+    lnd_delete(llp);
 }
 
 static int
@@ -681,7 +683,7 @@ lnd_damage(struct emp_qelem *list, int totdam)
     for (qp = list->q_back; qp != list; qp = next) {
        next = qp->q_back;
        llp = (struct ulist *)qp;
-       /* have to get it again because of collateral damage */
+       /* land unit might have changed (launched SAMs, collateral dmg) */
        getland(llp->unit.land.lnd_uid, &llp->unit.land);
        landdamage(&llp->unit.land, dam);
        putland(llp->unit.land.lnd_uid, &llp->unit.land);
@@ -721,6 +723,7 @@ lnd_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
     int mindam = lnd_count(list) * 20;
     int hardtarget = lnd_easiest_target(list);
     int dam, newdam, sublaunch;
+    int stopping = 0;
     struct plist *plp;
     struct emp_qelem msl_list, *qp, *newqp;
 
@@ -735,6 +738,7 @@ lnd_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
            if (msl_launch(&plp->plane, EF_LAND, "troops",
                           newx, newy, victim, &sublaunch) < 0)
                goto use_up_msl;
+           stopping = 1;
            if (msl_hit(&plp->plane, hardtarget, EF_LAND,
                        N_LND_MISS, N_LND_SMISS, sublaunch, victim)) {
                newdam = pln_damage(&plp->plane, 'p', 1);
@@ -754,8 +758,9 @@ lnd_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
     if (dam) {
        mpr(victim, "missile interdiction mission does %d damage!\n", dam);
        collateral_damage(newx, newy, dam);
+       lnd_damage(list, dam);
     }
-    return dam;
+    return stopping;
 }
 
 #if 0
@@ -768,19 +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);
@@ -790,6 +791,7 @@ lnd_fort_interdiction(struct emp_qelem *list,
        putsect(&fsect);
        if (dam < 0)
            continue;
+       stopping = 1;
        totdam += dam;
        mpr(victim, "Incoming fire does %d damage!\n", dam);
        wu(0, fsect.sct_own,
@@ -800,8 +802,8 @@ lnd_fort_interdiction(struct emp_qelem *list,
        nreport(fsect.sct_own, N_SCT_SHELL, victim, 1);
     }
     if (totdam > 0)
-       return lnd_damage(list, totdam);
-    return 0;
+       lnd_damage(list, totdam);
+    return stopping;
 }
 #endif
 
@@ -809,10 +811,14 @@ static int
 lnd_mission_interdiction(struct emp_qelem *list, coord x, coord y,
                         natid victim)
 {
-    return lnd_damage(list,
-                     unit_interdict(x, y, victim, "land units",
-                                    lnd_easiest_target(list),
-                                    MI_INTERDICT));
+    int dam;
+
+    dam = unit_interdict(x, y, victim, "land units",
+                        lnd_easiest_target(list),
+                        MI_INTERDICT);
+    if (dam >= 0)
+       lnd_damage(list, dam);
+    return dam >= 0;
 }
 
 int
@@ -827,9 +833,7 @@ lnd_interdict(struct emp_qelem *list, coord newx, coord newy, natid victim)
 #endif
 
     stopping |= lnd_mission_interdiction(list, newx, newy, victim);
-    stopping |=
-       lnd_damage(list,
-                  lnd_missile_interdiction(list, newx, newy, victim));
+    stopping |= lnd_missile_interdiction(list, newx, newy, victim);
     return stopping;
 }
 
@@ -850,13 +854,13 @@ lnd_hit_mine(struct lndstr *lp)
 {
     int m;
 
-    mpr(lp->lnd_own, "Blammo! Landmines detected in %s! ",
+    mpr(lp->lnd_own, "Blammo! Landmines detected in %s!\n",
        xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
 
     nreport(lp->lnd_own, N_LHIT_MINE, 0, 1);
 
     m = MINE_LDAMAGE();
-    if (lchr[lp->lnd_uid].l_flags & L_ENGINEER)
+    if (lchr[lp->lnd_type].l_flags & L_ENGINEER)
        m /= 2;
 
     landdamage(lp, m);
@@ -929,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;
            }
        }
@@ -973,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;
@@ -989,28 +994,28 @@ 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, NULL);
+                   lnd_delete(llp);
                }
            }
        }
@@ -1047,7 +1052,6 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
        /* move survivors to done */
        for (qp = cur.q_back; qp != &cur; qp = next) {
            next = qp->q_back;
-           llp = (struct ulist *)qp;
            emp_remque(qp);
            emp_insque(qp, &done);
        }
@@ -1060,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;
@@ -1079,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? */
@@ -1168,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;
@@ -1186,7 +1186,7 @@ lnd_set_tech(struct lndstr *lp, int tlev)
     struct lchrstr *lcp = lchr + lp->lnd_type;
 
     if (CANT_HAPPEN(tlev < lcp->l_tech))
-       tlev = 0;
+       tlev = lcp->l_tech;
 
     lp->lnd_tech = tlev;
 }