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

Fix ship interdiction targeting ships not at sea

Browse source 
perform_mission() needs to know whether it is targeting ships or
something else, because the rules differ: submarines interdict only
ships, land units get their damage reduced when interdicting ships,
and different news are generated.

The old code assumed it was targeting ships when the target sector was
sea.  Wrong when interdicting ships in harbors, bridges and such.
This has always been broken.  Except when checking a submarine's
target: there it tested argument s, which is gross, but at least it
works.  That code was added in v4.0.8.

Replace the broken test by the gross hack everywhere.  This fixes news
and damage from land units when ships get interdicted in non-sea
sectors.
This commit is contained in:
Markus Armbruster 2008-06-08 11:35:04 +02:00
parent e1d7f9bf8e
commit 3e251b474f
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/lib/subs/mission.c
View file

@ -344,10 +344,10 @@ build_mission_list_type(struct genlist *mi, coord x, coord y, int mission,
if (getrel(getnatp(gp->own), sect.sct_own) > AT_WAR) { if (getrel(getnatp(gp->own), sect.sct_own) > AT_WAR) {
/* /*
* If the player->owner of the unit isn't at war * If the owner of the unit isn't at war
* with the victim, and doesn't own the * with the victim, and doesn't own the
* sect being acted upon, and isn't the * sect being acted upon, and isn't the
* old player->owner of that sect, bounce them. * old owner of that sect, bounce them.
*/ */
if (sect.sct_type != SCT_WATER && if (sect.sct_type != SCT_WATER &&
sect.sct_own != gp->own && sect.sct_own != gp->own &&
@ -412,6 +412,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
natid plane_owner = 0; natid plane_owner = 0;
int md, range, air_dam = 0; int md, range, air_dam = 0;
double hitchance, vrange; double hitchance, vrange;
int targeting_ships = *s == 's'; /* "subs" or "ships" FIXME gross! */
getsect(x, y, &sect); getsect(x, y, &sect);
@ -445,12 +446,12 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
if (dam2 < 0) if (dam2 < 0)
continue; continue;
if (sect.sct_type == SCT_WATER) { if (targeting_ships) {
if (chance(lnd_acc(lp) / 100.0)) if (chance(lnd_acc(lp) / 100.0))
dam2 = ldround(dam2 / 2.0, 1); dam2 = ldround(dam2 / 2.0, 1);
} }
dam += dam2; dam += dam2;
if (sect.sct_type == SCT_WATER) if (targeting_ships)
nreport(lp->lnd_own, N_SHP_SHELL, victim, 1); nreport(lp->lnd_own, N_SHP_SHELL, victim, 1);
else else
nreport(lp->lnd_own, N_SCT_SHELL, victim, 1); nreport(lp->lnd_own, N_SCT_SHELL, victim, 1);
@ -482,10 +483,8 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
continue; continue;
} }
if (mcp->m_flags & M_SUB) { if (mcp->m_flags & M_SUB) {
/* If we aren't shooting at "subs" or "ships" don't fire at all from if (!targeting_ships)
a sub. */ continue; /* subs interdict only ships */
if (*s != 's')
continue;
range = roundrange(torprange(sp)); range = roundrange(torprange(sp));
if (md > range) if (md > range)
continue; continue;
@ -535,7 +534,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
if (dam2 < 0) if (dam2 < 0)
continue; continue;
dam += dam2; dam += dam2;
if (sect.sct_type == SCT_WATER) if (targeting_ships)
nreport(sp->shp_own, N_SHP_SHELL, victim, 1); nreport(sp->shp_own, N_SHP_SHELL, victim, 1);
else else
nreport(sp->shp_own, N_SCT_SHELL, victim, 1); nreport(sp->shp_own, N_SCT_SHELL, victim, 1);
@ -668,7 +667,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
if (air_dam > 0) { if (air_dam > 0) {
dam += air_dam; dam += air_dam;
if (sect.sct_type == SCT_WATER) if (targeting_ships)
nreport(plane_owner, N_SHP_BOMB, victim, 1); nreport(plane_owner, N_SHP_BOMB, victim, 1);
else else
nreport(plane_owner, N_SCT_BOMB, victim, 1); nreport(plane_owner, N_SCT_BOMB, victim, 1);