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);
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, §)) {
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;
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;
}
{
struct lndstr land, *ldr = NULL;
struct ulist *llp;
- int this_mot;
- int mobtype = MOB_MOVE; /* indeterminate */
emp_initque(list);
while (nxtitem(ni, &land)) {
*/
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;
- }
- }
if (!lnd_may_mar(&land, ldr, ""))
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;
- }
- }
land.lnd_mission = 0;
land.lnd_rflags = 0;
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 lndstr *lp, *ldr = NULL;
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;
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;
}
}
lnd_put_one(llp);
}
-static void
+void
lnd_mar_put(struct emp_qelem *list, natid actor)
{
struct emp_qelem *qp, *next;
sect.sct_item[I_SHELL] = sshells;
putland(llp->unit.land.lnd_uid, &llp->unit.land);
putsect(§);
- if (lnd_check_one_mines(llp, 1)) {
- stopping = 1;
- emp_remque(qp);
- free(qp);
- }
+ stopping |= lnd_check_one_mines(llp, 1);
}
return stopping;
}
sect.sct_mines--;
putsect(§);
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;
}
{
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)
}
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;
coord newx;
coord newy;
int move;
- int stopping = 0;
- int visible;
- char dp[80];
int rel;
int oldown;
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;
}
}
}
- 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);
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;
projects / empserver / blobdiff