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

Clarify how perform_mission() uses missiles

Browse source 
Interdiction of ships and land units with missiles happens elsewhere.
Oops when perform_mission() strays on that turf.
This commit is contained in:
Markus Armbruster 2009-10-11 11:58:00 -04:00
parent 0060e48ea4
commit 4dbee9a388
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -548,13 +548,21 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
} }
} }
/*
* Missiles, except for interdiction of ships or land units,
* because that happens elsewhere, in shp_missile_interdiction()
* and lnd_missile_interdiction().
*/
air_dam = 0; air_dam = 0;
for (qp = missiles.q_back; qp != &missiles; qp = newqp) { for (qp = missiles.q_back; qp != &missiles; qp = newqp) {
newqp = qp->q_back; newqp = qp->q_back;
plp = (struct plist *)qp; plp = (struct plist *)qp;
if (air_dam < 100 && mission_pln_equip(plp, NULL, 'p') >= 0) { if (air_dam < 100
if (msl_hit(&plp->plane, hardtarget, EF_SECTOR, && !CANT_HAPPEN(hardtarget != SECT_HARDTARGET
|| (plp->pcp->pl_flags & P_MAR))
&& mission_pln_equip(plp, NULL, 'p') >= 0) {
if (msl_hit(&plp->plane, SECT_HARDTARGET, EF_SECTOR,
N_SCT_MISS, N_SCT_SMISS, N_SCT_MISS, N_SCT_SMISS,
"sector", x, y, victim)) { "sector", x, y, victim)) {
dam2 = pln_damage(&plp->plane, 'p', 1); dam2 = pln_damage(&plp->plane, 'p', 1);