empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

march attack assault: Hit mines like ships do

Browse source 
When ships enter a sector with sea mines, any minesweepers sweep, then
hit mines, and finally all ships (including the minesweepers) hit
mines.  Sweeping in a sector (navigate sub-command 'm') works the same
without the final step.

When land units enter a sector with land mines, any engineers sweep,
and then all land units (including the engineers) hit mines.  Sweeping
in a sector (march sub-command 'm') works the same, which means
non-engineers can hit mines then.  Broken in Empire 2.

Actually broken for ships too then.  4.0.17 fixed ships, but neglected
to fix land units.

Change the land unit code to work like the ship code.  Fixes march
sub-command 'm' not to expose non-engineers to mines.  Changes march,
attack and assault with option INTERDICT_ATT enabled to expose
engineers twice.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-12-29 18:05:30 +01:00
parent 5ce7419ef7
commit f1042f82f1
6 changed files with 58 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/subs/lndsub.c
View file

@ -52,6 +52,7 @@
#include "unit.h"
#include "xy.h"
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);
@ -581,7 +582,7 @@ lnd_put_one(struct ulist *llp)
* a player. Else it's an automatic "on the move" sweep.
* If TAKEMOB is non-zero, require and charge mobility.
*/
void
int
lnd_sweep(struct emp_qelem *land_list, int explicit, int takemob,
natid actor)
{
@ -590,6 +591,7 @@ lnd_sweep(struct emp_qelem *land_list, int explicit, int takemob,
struct ulist *llp;
struct sctstr sect;
int mines, m, max, sshells, lshells;
int stopping = 0;
for (qp = land_list->q_back; qp != land_list; qp = next) {
next = qp->q_back;
@ -641,7 +643,13 @@ 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);
}
}
return stopping;
}
static int
@ -1096,7 +1104,9 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
}
if (QEMPTY(list))
return stopping;
lnd_sweep(list, 0, 1, actor);
stopping |= lnd_sweep(list, 0, 1, actor);
if (QEMPTY(list))
return stopping;
stopping |= lnd_check_mines(list);
if (QEMPTY(list))
return stopping;