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

(getilist): Remove bogus fuel check. It was inconsistent with the one

Browse source 
in mission_pln_equip(), which is called from ac_intercept().  The
inconsistency appeared in Empire3, and had no ill effect then.  But
rev. 1.42 screwed up the fuel test here: it made interceptors that
don't use fuel (SAMs) require petrol to be present to fly.
This commit is contained in:
Markus Armbruster 2007-11-23 18:23:06 +00:00
parent 8e430ae2e3
commit b46191aebb
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1032,11 +1032,8 @@ getilist(struct emp_qelem *list, natid own, struct emp_qelem *a,
{ {
struct plchrstr *pcp; struct plchrstr *pcp;
struct plnstr plane; struct plnstr plane;
struct shpstr ship;
struct lndstr land;
struct sctstr sect; struct sctstr sect;
struct nstr_item ni; struct nstr_item ni;
int petrol;
struct plist *ip; struct plist *ip;
emp_initque(list); emp_initque(list);
@ -1053,25 +1050,15 @@ getilist(struct emp_qelem *list, natid own, struct emp_qelem *a,
continue; continue;
if (plane.pln_effic < 40) if (plane.pln_effic < 40)
continue; continue;
if (plane.pln_ship >= 0) { if (plane.pln_ship >= 0 || plane.pln_land >= 0) {
if (!can_fly(plane.pln_uid)) if (!can_fly(plane.pln_uid))
continue; continue;
getship(plane.pln_ship, &ship);
petrol = ship.shp_item[I_PETROL];
} else if (plane.pln_land >= 0) {
if (!can_fly(plane.pln_uid))
continue;
getland(plane.pln_land, &land);
petrol = land.lnd_item[I_PETROL];
} else { } else {
getsect(plane.pln_x, plane.pln_y, &sect); getsect(plane.pln_x, plane.pln_y, &sect);
petrol = sect.sct_item[I_PETROL];
if ((sect.sct_effic < 60 || sect.sct_type != SCT_AIRPT) if ((sect.sct_effic < 60 || sect.sct_type != SCT_AIRPT)
&& (pcp->pl_flags & P_V) == 0) && (pcp->pl_flags & P_V) == 0)
continue; continue;
} }
if (petrol <= pcp->pl_fuel / 2)
continue;
/* Finally, is it in the list of planes already in /* Finally, is it in the list of planes already in
flight? */ flight? */
if (ac_isflying(&plane, a)) if (ac_isflying(&plane, a))