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

navigate march: Stop on non-fatal mine hits, too

Browse source 
We stop on mine hits only when they're fatal.  Has always been that
way.  When interdiction was added in Chainsaw, it worked the same.
Empire 2 changed the commands to stop on any interdiction damage.  Now
stop on any mine damage, too.

Interdiction can fail to do damage (all bombs miss), and mines can be
detected without damage (by sweeping).  Perhaps we should stop then as
well.  Left for another day.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-05 20:23:46 +01:00
parent 0538f95cd6
commit c5c6fc8a66
5 changed files with 74 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -691,11 +691,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;
}
@ -715,8 +711,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;
}
@ -726,18 +725,12 @@ 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;
}