X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Flndsub.c;h=2dd7f388252e58b0917d4d5006f7f6b91b19b7bc;hp=db520020eecdedbf3f3f7f487148f5a9e089be60;hb=beedf8dce;hpb=bbacc2860670f46e26f0a2826edb2b77fd79d5a3

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index db520020e..2dd7f3882 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2004-2014
+ *     Markus Armbruster, 2004-2015
  */
 
 #include <config.h>
@@ -52,8 +52,8 @@
 #include "unit.h"
 #include "xy.h"
 
+static void lnd_mar_put_one(struct ulist *);
 static int lnd_check_one_mines(struct ulist *, int);
-static void lnd_stays(natid, char *, struct ulist *);
 static int lnd_hit_mine(struct lndstr *);
 static int has_helpful_engineer(coord, coord, natid);
 
@@ -399,12 +399,95 @@ intelligence_report(int destination, struct lndstr *lp, int spy,
     }
 }
 
+int
+lnd_may_mar(struct lndstr *lp, struct lndstr *ldr, char *suffix)
+{
+    struct sctstr sect;
+    int mobtype;
+
+    if (!lp->lnd_own || !getsect(lp->lnd_x, lp->lnd_y, &sect)) {
+	CANT_REACH();
+	return 0;
+    }
+
+    if (opt_MARKET && ontradingblock(EF_LAND, lp)) {
+	mpr(lp->lnd_own, "%s is on the trading block%s\n",
+	    prland(lp), suffix);
+	return 0;
+    }
+
+    if (lp->lnd_ship >= 0) {
+	mpr(lp->lnd_own, "%s is on a ship%s\n", prland(lp), suffix);
+	return 0;
+    }
+    if (lp->lnd_land >= 0) {
+	mpr(lp->lnd_own, "%s is on a unit%s\n", prland(lp), suffix);
+	return 0;
+    }
+
+    if (!(lchr[lp->lnd_type].l_flags & L_SPY) &&
+	!(lchr[lp->lnd_type].l_flags & L_TRAIN) &&
+	lp->lnd_item[I_MILIT] == 0) {
+	mpr(lp->lnd_own, "%s has no mil on it to guide it%s\n",
+	    prland(lp), suffix);
+	return 0;
+    }
+
+    switch (lnd_check_mar(lp, &sect)) {
+    case LND_STUCK_NOT:
+	break;
+    case LND_STUCK_NO_RAIL:
+	mpr(lp->lnd_own, "%s is stuck off the rail system%s\n",
+	    prland(lp), suffix);
+	return 0;
+    default:
+	CANT_REACH();
+	/* fall through */
+    case LND_STUCK_IMPASSABLE:
+	mpr(lp->lnd_own, "%s is stuck%s\n", prland(lp), suffix);
+	return 0;
+    }
+
+    if (relations_with(sect.sct_own, lp->lnd_own) != ALLIED &&
+	!(lchr[lp->lnd_type].l_flags & L_SPY) &&
+	sect.sct_own) {
+	mpr(lp->lnd_own, "%s has been kidnapped by %s%s\n",
+	    prland(lp), cname(sect.sct_own), suffix);
+	return 0;
+    }
+
+    if (ldr && (lp->lnd_x != ldr->lnd_x || lp->lnd_y != ldr->lnd_y)) {
+	mpr(lp->lnd_own, "%s is not with the leader%s\n",
+	    prland(lp), suffix);
+	return 0;
+    }
+
+    /*
+     * The marching code gets confused when trains and non-trains
+     * march together.  Disallow for now.
+     */
+    mobtype = lnd_mobtype(lp);
+    if (!ldr || mobtype == lnd_mobtype(ldr))
+	;
+    else if (mobtype == MOB_RAIL) {
+	mpr(lp->lnd_own,
+	    "%s is a train and can't march with the leader%s\n",
+	    prland(lp), suffix);
+	return 0;
+    } else {
+	mpr(lp->lnd_own, "%s can't rail-march with the leading train%s\n",
+	    prland(lp), suffix);
+	return 0;
+    }
+
+    return 1;
+}
+
 void
 lnd_sel(struct nstr_item *ni, struct emp_qelem *list)
 {
-    struct lndstr land;
-    int this_mot;
-    int mobtype = MOB_MOVE;	/* indeterminate */
+    struct lndstr land, *ldr = NULL;
+    struct ulist *llp;
 
     emp_initque(list);
     while (nxtitem(ni, &land)) {
@@ -415,38 +498,16 @@ lnd_sel(struct nstr_item *ni, struct emp_qelem *list)
 	 */
 	if (!land.lnd_own || land.lnd_own != player->cnum)
 	    continue;
-	if (opt_MARKET) {
-	    if (ontradingblock(EF_LAND, &land)) {
-		pr("unit #%d inelligible - it's for sale.\n",
-		   land.lnd_uid);
-		continue;
-	    }
-	}
-	/*
-	 * The marching code gets confused when trains and non-trains
-	 * march together.  Disallow for now.
-	 */
-	this_mot = lnd_mobtype(&land);
-	if (this_mot != mobtype) {
-	    if (mobtype == MOB_MOVE)
-		mobtype = this_mot;
-	    else if (mobtype == MOB_MARCH) {
-		pr("%s is a train and can't march with the leader.\n",
-		   prland(&land));
-		continue;
-	    } else {
-		pr("%s can't rail-march with the leading train.\n",
-		   prland(&land));
-		continue;
-	    }
-	}
+	if (!lnd_may_mar(&land, ldr, ""))
+	    continue;
 
 	land.lnd_mission = 0;
 	land.lnd_rflags = 0;
-	land.lnd_harden = 0;
 	memset(land.lnd_rpath, 0, sizeof(land.lnd_rpath));
 	putland(land.lnd_uid, &land);
-	lnd_insque(&land, list);
+	llp = lnd_insque(&land, list);
+	if (!ldr)
+	    ldr = &llp->unit.land;
     }
 }
 
@@ -465,25 +526,21 @@ lnd_insque(struct lndstr *lp, struct emp_qelem *list)
     return mlp;
 }
 
-/* This function assumes that the list was created by lnd_sel */
 void
-lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
-	natid actor)
+lnd_mar_stay_behind(struct emp_qelem *list, natid actor)
 {
     struct emp_qelem *qp;
     struct emp_qelem *next;
     struct ulist *llp;
     struct lndstr *lp, *ldr = NULL;
-    struct sctstr sect;
-    char mess[128];
+    char and_stays[32];
 
-    *minmobp = 9876.0;
-    *maxmobp = -9876.0;
     for (qp = list->q_back; qp != list; qp = next) {
 	next = qp->q_back;
 	llp = (struct ulist *)qp;
 	lp = &llp->unit.land;
 	getland(lp->lnd_uid, lp);
+
 	if (lp->lnd_own != actor) {
 	    mpr(actor, "%s was disbanded at %s\n",
 		prland(lp), xyas(lp->lnd_x, lp->lnd_y, actor));
@@ -491,57 +548,19 @@ lnd_mar(struct emp_qelem *list, double *minmobp, double *maxmobp,
 	    free(llp);
 	    continue;
 	}
-	if (lp->lnd_ship >= 0) {
-	    lnd_stays(actor, "is on a ship", llp);
-	    continue;
-	}
-	if (lp->lnd_land >= 0) {
-	    lnd_stays(actor, "is on a unit", llp);
-	    continue;
-	}
-	if (!getsect(lp->lnd_x, lp->lnd_y, &sect)) {
-	    lnd_stays(actor, "was sucked into the sky by a strange looking spaceland", llp);	/* heh -KHS */
-	    continue;
-	}
-	if (!(lchr[lp->lnd_type].l_flags & L_SPY) &&
-	    !(lchr[lp->lnd_type].l_flags & L_TRAIN) &&
-	    lp->lnd_item[I_MILIT] == 0) {
-	    lnd_stays(actor, "has no mil on it to guide it", llp);
-	    continue;
-	}
-	switch (lnd_check_mar(lp, &sect)) {
-	case LND_STUCK_NOT:
-	    break;
-	case LND_STUCK_NO_RAIL:
-	    lnd_stays(actor, "is stuck off the rail system", llp);
-	    continue;
-	default:
-	    CANT_REACH();
-	    /* fall through */
-	case LND_STUCK_IMPASSABLE:
-	    lnd_stays(actor, "is stuck", llp);
-	    continue;
-	}
-	if (relations_with(sect.sct_own, actor) != ALLIED &&
-	    !(lchr[lp->lnd_type].l_flags & L_SPY) &&
-	    sect.sct_own) {
-	    sprintf(mess, "has been kidnapped by %s", cname(sect.sct_own));
-	    lnd_stays(actor, mess, llp);
+
+	snprintf(and_stays, sizeof(and_stays), " & stays in %s",
+		 xyas(lp->lnd_x, lp->lnd_y, actor));
+	if (!lnd_may_mar(lp, ldr, and_stays)) {
+	    lnd_mar_put_one(llp);
 	    continue;
 	}
+
 	if (!ldr)
 	    ldr = lp;
-	else if (lp->lnd_x != ldr->lnd_x || lp->lnd_y != ldr->lnd_y) {
-	    lnd_stays(actor, "is not with the leader", llp);
-	    continue;
-	}
 	if (lp->lnd_mobil + 1 < (int)llp->mobil) {
 	    llp->mobil = lp->lnd_mobil;
 	}
-	if (llp->mobil < *minmobp)
-	    *minmobp = llp->mobil;
-	if (llp->mobil > *maxmobp)
-	    *maxmobp = llp->mobil;
     }
 }
 
@@ -554,7 +573,7 @@ lnd_mar_put_one(struct ulist *llp)
     lnd_put_one(llp);
 }
 
-static void
+void
 lnd_mar_put(struct emp_qelem *list, natid actor)
 {
     struct emp_qelem *qp, *next;
@@ -671,11 +690,7 @@ lnd_sweep(struct emp_qelem *land_list, int explicit, int takemob,
 	sect.sct_item[I_SHELL] = sshells;
 	putland(llp->unit.land.lnd_uid, &llp->unit.land);
 	putsect(&sect);
-	if (lnd_check_one_mines(llp, 1)) {
-	    stopping = 1;
-	    emp_remque(qp);
-	    free(qp);
-	}
+	stopping |= lnd_check_one_mines(llp, 1);
     }
     return stopping;
 }
@@ -695,8 +710,11 @@ lnd_check_one_mines(struct ulist *llp, int with_eng)
 	sect.sct_mines--;
 	putsect(&sect);
 	putland(llp->unit.land.lnd_uid, &llp->unit.land);
-	if (!llp->unit.land.lnd_own)
-	    return 1;
+	if (!llp->unit.land.lnd_own) {
+	    emp_remque(&llp->queue);
+	    free(llp);
+	}
+	return 1;
     }
     return 0;
 }
@@ -706,31 +724,16 @@ lnd_check_mines(struct emp_qelem *land_list)
 {
     struct emp_qelem *qp;
     struct emp_qelem *next;
-    struct ulist *llp;
     int stopping = 0;
     int with_eng = !!lnd_find_capable(land_list, L_ENGINEER);
 
     for (qp = land_list->q_back; qp != land_list; qp = next) {
 	next = qp->q_back;
-	llp = (struct ulist *)qp;
-	if (lnd_check_one_mines(llp, with_eng)) {
-	    stopping = 1;
-	    emp_remque(qp);
-	    free(qp);
-	}
+	stopping |= lnd_check_one_mines((struct ulist *)qp, with_eng);
     }
     return stopping;
 }
 
-static void
-lnd_stays(natid actor, char *str, struct ulist *llp)
-{
-    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));
-    lnd_mar_put_one(llp);
-}
-
 /* Return whether and why SP would be stuck in SECTP.  */
 enum lnd_stuck
 lnd_check_mar(struct lndstr *lp, struct sctstr *sectp)
@@ -1001,7 +1004,7 @@ int lnd_abandon_askyn(struct emp_qelem *list)
 }
 
 int
-lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
+lnd_mar_dir(struct emp_qelem *list, int dir, natid actor)
 {
     struct sctstr sect, osect;
     struct emp_qelem *qp;
@@ -1012,9 +1015,6 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
     coord newx;
     coord newy;
     int move;
-    int stopping = 0;
-    int visible;
-    char dp[80];
     int rel;
     int oldown;
 
@@ -1072,12 +1072,17 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
 	llp = (struct ulist *)qp;
 	if (rel != ALLIED
 	    && !(lchr[llp->unit.land.lnd_type].l_flags & L_SPY)) {
-	    sprintf(dp, "can't go to %s", xyas(newx, newy, actor));
-	    lnd_stays(actor, dp, llp);
+	    mpr(actor, "%s can't go to %s & stays in %s\n",
+		prland(&llp->unit.land), xyas(newx, newy, actor),
+		xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, actor));
+	    lnd_mar_put_one(llp);
 	    continue;
 	}
 	if (llp->mobil <= 0.0) {
-	    lnd_stays(actor, "is out of mobility", llp);
+	    mpr(actor, "%s is out of mobility & stays in %s\n",
+		prland(&llp->unit.land),
+		xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, actor));
+	    lnd_mar_put_one(llp);
 	    continue;
 	}
 	llp->unit.land.lnd_x = newx;
@@ -1115,9 +1120,21 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
 	    }
 	}
     }
-    if (QEMPTY(list))
-	return stopping;
-    stopping |= lnd_sweep(list, 0, 1, actor);
+
+    return 0;
+}
+
+int
+lnd_mar_gauntlet(struct emp_qelem *list, int interdict, natid actor)
+{
+    struct ulist *mlp = (struct ulist *)list->q_back;
+    coord newx = mlp->unit.land.lnd_x;
+    coord newy = mlp->unit.land.lnd_y;
+    int stopping, visible;
+    struct emp_qelem *qp, *next;
+    struct ulist *llp;
+
+    stopping = lnd_sweep(list, 0, 1, actor);
     if (QEMPTY(list))
 	return stopping;
     stopping |= lnd_check_mines(list);
@@ -1131,7 +1148,7 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
 	if (!(lchr[(int)llp->unit.land.lnd_type].l_flags & L_SPY))
 	    visible = 1;
     }
-    if (visible)
+    if (visible && interdict)
 	stopping |= lnd_interdict(list, newx, newy, actor);
 
     return stopping;