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

Stop ship and land unit movement on interdiction with no damage

Browse source 
Movement stops when shp_interdict() or lnd_interdict() report
interdiction.  However, they reported it only when there was
interdiction damage.

Zero interdiction damage commonly happens when interdicting missiles
miss, or all bombers abort.  Stopping regardless of damage makes more
sense there.

Moreover, not stopping is buggy: do_unit_move() needs to take care not
to wipe out updates made by interdiction to the moving ships or land
units.  It does so only when it stops.  Updates made by interdiction
without interdiction damage could get wiped out, triggering a seqno
mismatch oops.

Known ways moving ships and land units can get updated by interdiction
despite there is no interdiction damage:

* Interdicting bombers get intercepted by planes based on a navigating
  carrier, carrier gets charged petrol.  The bug wipes out the petrol
  use.

* Marching land units get interdicted by planes, but all planes miss.
  Sufficiently large collateral damage to the sector can still damage
  the land units.  The bug wipes out the damage to land units.

To make shp_interdict() and lnd_interdict() report interdiction
regardless of damage, change lnd_missile_interdiction(),
lnd_fort_interdiction(), lnd_mission_interdiction(),
shp_missile_interdiction(), shp_fort_interdiction(),
shp_mission_interdiction() to return whether there was interdiction.
Before, they returned whether there was damage.

Change unit_interdict(), perform_mission(), perform_mission_land(),
perform_mission_ship(), perform_mission_msl(), and
perform_mission_bomb() to return -1 for no interdiction, so that
callers can distinguish no interdiction from interdiction with no
damage.
This commit is contained in:
Markus Armbruster 2010-01-09 16:21:40 +01:00
parent 05b56fa942
commit 227854bca2
3 changed files with 62 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -500,6 +500,7 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
if (msl_launch(&plp->plane, EF_SHIP, prship(&mvs->unit.ship),
newx, newy, victim, &sublaunch) < 0)
goto use_up_msl;
stopping = 1;
if (msl_hit(&plp->plane,
shp_hardtarget(&mvs->unit.ship), EF_SHIP,
N_SHP_MISS, N_SHP_SMISS, sublaunch, victim)) {
@ -509,7 +510,6 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
"missile interdiction mission does %d damage to %s!\n",
dam, prship(&mvs->unit.ship));
shp_damage_one(mvs, dam);
stopping = 1;
}
} else {
dam = pln_damage(&plp->plane, 'p', 0);
@ -578,6 +578,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
struct sctstr fsect;
int trange, range;
int dam;
int stopping = 0;
int totdam = 0;
signed char notified[MAXNOC];
int i;
@ -621,6 +622,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
putsect(&fsect);
if (dam < 0)
continue;
stopping = 1;
totdam += dam;
mpr(victim, "Incoming fire does %d damage!\n", dam);
#if 0
@ -636,8 +638,8 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
nreport(fsect.sct_own, N_SHP_SHELL, victim, 1);
}
if (totdam > 0)
return shp_damage(list, totdam, 0, M_SUB, newx, newy);
return 0;
shp_damage(list, totdam, 0, M_SUB, newx, newy);
return stopping;
}
static int
@ -647,13 +649,14 @@ shp_mission_interdiction(struct emp_qelem *list, coord x, coord y,
char *what = subs ? "subs" : "ships";
int wantflags = subs ? M_SUB : 0;
int nowantflags = subs ? 0 : M_SUB;
int dam;
return shp_damage(list,
unit_interdict(x, y, victim, what,
shp_easiest_target(list,
wantflags, nowantflags),
MI_INTERDICT),
wantflags, nowantflags, x, y);
dam = unit_interdict(x, y, victim, what,
shp_easiest_target(list, wantflags, nowantflags),
MI_INTERDICT);
if (dam >= 0)
shp_damage(list, dam, wantflags, nowantflags, x, y);
return dam >= 0;
}
static int