/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
static void shp_nav_put_one(struct ulist *);
static int shp_check_one_mines(struct ulist *);
static int shp_hit_mine(struct shpstr *);
-static void shp_stays(natid, char *, struct ulist *);
static struct ulist *
shp_find_capable(struct emp_qelem *list, int flags)
}
/*
- * Append SP to LIST.
+ * Append @sp to @list.
* Return the new list link.
*/
struct ulist *
}
}
-static void
+void
shp_nav_put(struct emp_qelem *list, natid actor)
{
struct emp_qelem *qp, *next;
}
/*
- * Sweep seamines with engineers in SHIP_LIST for ACTOR.
- * All ships in SHIP_LIST must be in the same sector.
- * If EXPLICIT is non-zero, this is for an explicit sweep command from
+ * Sweep seamines with engineers in @ship_list for @actor.
+ * All ships in @ship_list must be in the same sector.
+ * If @explicit is non-zero, this is for an explicit sweep command from
* a player. Else it's an automatic "on the move" sweep.
- * If TAKEMOB is non-zero, require and charge mobility.
+ * If @takemob is non-zero, require and charge mobility.
* Return non-zero when the ships should stop.
*/
int
mlp->unit.ship.shp_item[I_SHELL] = shells;
putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
putsect(§);
- if (shp_check_one_mines(mlp)) {
- stopping = 1;
- emp_remque(qp);
- free(qp);
- }
+ stopping |= shp_check_one_mines(mlp);
}
if (changed)
writemap(actor);
writemap(actor);
putsect(§);
putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
- if (!mlp->unit.ship.shp_own)
- return 1;
+ if (!mlp->unit.ship.shp_own) {
+ emp_remque(&mlp->queue);
+ free(mlp);
+ }
+ return 1;
}
return 0;
}
{
struct emp_qelem *qp;
struct emp_qelem *next;
- struct ulist *mlp;
int stopping = 0;
for (qp = ship_list->q_back; qp != ship_list; qp = next) {
next = qp->q_back;
- mlp = (struct ulist *)qp;
- if (shp_check_one_mines(mlp)) {
- stopping = 1;
- emp_remque(qp);
- free(qp);
- }
+ stopping |= shp_check_one_mines((struct ulist *)qp);
}
return stopping;
}
-
-static void
-shp_stays(natid actor, char *str, struct ulist *mlp)
-{
- mpr(actor, "%s %s & stays in %s\n",
- prship(&mlp->unit.ship), str,
- xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
- shp_nav_put_one(mlp);
-}
-
/*
- * Return whether and why SP would be stuck in SECTP.
+ * Return whether and why @sp would be stuck in @sectp.
*/
enum shp_stuck
shp_check_nav(struct shpstr *sp, struct sctstr *sectp)
if (msl_hit(&plp->plane,
shp_hardtarget(&mvs->unit.ship), EF_SHIP,
N_SHP_MISS, N_SHP_SMISS, sublaunch, victim)) {
- dam = pln_damage(&plp->plane, 'p', 1);
+ dam = pln_damage(&plp->plane, 'p', "");
mpr(victim,
"missile interdiction mission does %d damage to %s!\n",
dam, prship(&mvs->unit.ship));
shp_damage_one(mvs, dam);
} else {
- dam = pln_damage(&plp->plane, 'p', 0);
+ dam = pln_damage(&plp->plane, 'p', NULL);
collateral_damage(newx, newy, dam);
}
mvs = most_valuable_ship(list, newx, newy);
}
int
-shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor)
+shp_nav_dir(struct emp_qelem *list, int dir, natid actor)
{
struct sctstr sect;
struct emp_qelem *qp;
coord newy;
int move;
enum shp_stuck stuck;
- int stopping = 0;
double mobcost;
- char dp[80];
if (CANT_HAPPEN(QEMPTY(list)))
return 1;
mlp = (struct ulist *)qp;
stuck = shp_check_nav(&mlp->unit.ship, §);
if (stuck == SHP_STUCK_CANAL) {
- sprintf(dp,
- "is too large to fit into the canal system at %s",
- xyas(newx, newy, actor));
- shp_stays(actor, dp, mlp);
+ mpr(actor,
+ "%s is too large to fit into the canal system at %s"
+ " & stays in %s\n",
+ prship(&mlp->unit.ship), xyas(newx, newy, actor),
+ xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
+ shp_nav_put_one(mlp);
continue;
} else if (CANT_HAPPEN(stuck != SHP_STUCK_NOT)) {
- sprintf(dp, "can't go to %s", xyas(newx, newy, actor));
- shp_stays(actor, dp, mlp);
+ mpr(actor, "%s can't go to %s & stays in %s\n",
+ prship(&mlp->unit.ship), xyas(newx, newy, actor),
+ xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
+ shp_nav_put_one(mlp);
continue;
}
if (mlp->mobil <= 0.0) {
- shp_stays(actor, "is out of mobility", mlp);
+ mpr(actor, "%s is out of mobility & stays in %s\n",
+ prship(&mlp->unit.ship),
+ xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
+ shp_nav_put_one(mlp);
continue;
}
mobcost = shp_mobcost(&mlp->unit.ship);
mlp->unit.ship.shp_mobil = (int)mlp->mobil;
putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
}
+
+ return QEMPTY(list);
+}
+
+int
+shp_nav_gauntlet(struct emp_qelem *list, int interdict, natid actor)
+{
+ struct ulist *mlp = (struct ulist *)list->q_back;
+ coord newx, newy;
+ int stopping;
+
+ if (CANT_HAPPEN(QEMPTY(list)))
+ return 1;
+ newx = mlp->unit.ship.shp_x;
+ newy = mlp->unit.ship.shp_y;
+ stopping = shp_sweep(list, 0, 0, actor);
if (QEMPTY(list))
- return stopping;
- stopping |= shp_sweep(list, 0, 0, actor);
- if (QEMPTY(list))
- return stopping;
+ return 1;
stopping |= shp_check_mines(list);
if (QEMPTY(list))
- return stopping;
- stopping |= shp_interdict(list, newx, newy, actor);
+ return 1;
+ if (interdict)
+ stopping |= shp_interdict(list, newx, newy, actor);
return stopping;
}
}
/*
- * Set SP's tech to TLEV along with everything else that depends on it.
+ * Set @sp's tech to @tlev along with everything else that depends on it.
*/
void
shp_set_tech(struct shpstr *sp, int tlev)
projects / empserver / blobdiff