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

Don't let planes on trading block intercept or interdict

Browse source 
Fighters, SAMs, ABMs and anti-sats could intercept, and tactical
missiles could interdict ships or land units.

Missed when the other missions were fixed in v4.2.7.
This commit is contained in:
Markus Armbruster 2011-04-16 21:00:27 +02:00
parent 04a332a89d
commit 2f05b844c1
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/subs/aircombat.c
View file

@ -778,6 +778,10 @@ getilists(struct emp_qelem *list, unsigned char *rel, natid intruder)
continue; continue;
if (plane.pln_effic < 40) if (plane.pln_effic < 40)
continue; continue;
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, &plane))
continue;
}
if (!pln_airbase_ok(&plane, 0, 0)) if (!pln_airbase_ok(&plane, 0, 0))
continue; continue;
/* got one! */ /* got one! */

4
src/lib/subs/mslsub.c
View file

@ -207,6 +207,10 @@ msl_sel(struct emp_qelem *list, coord x, coord y, natid victim,
continue; continue;
if (plane.pln_effic < 100) if (plane.pln_effic < 100)
continue; continue;
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, &plane))
continue;
}
if (!pln_airbase_ok(&plane, 1, 0)) if (!pln_airbase_ok(&plane, 1, 0))
continue; continue;
/* got a valid interceptor */ /* got a valid interceptor */