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

Eliminate a few pointless relations variables

Browse source 
Just to make the next few commits easier to review.
This commit is contained in:
Markus Armbruster 2011-01-29 13:09:26 +01:00
parent bb5cd07ce5
commit 7ebbe7da4c
5 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -603,7 +603,6 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
struct mchrstr *mcp;
double flak, total, ngun;
int gun;
int rel;
struct plist *plp;
natid plane_owner;
natid from;
@ -619,8 +618,7 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
mcp = &mchr[(int)ship.shp_type];
if (mcp->m_flags & M_SUB)
continue;
rel = getrel(getnatp(ship.shp_own), plane_owner);
if (rel > HOSTILE)
if (getrel(getnatp(ship.shp_own), plane_owner) > HOSTILE)
continue;
gun = shp_usable_guns(&ship);
if (gun == 0)
@ -653,7 +651,6 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
struct lchrstr *lcp;
double flak, total, ngun;
int aaf, gun;
int rel;
struct plist *plp;
natid plane_owner;
natid from;
@ -672,8 +669,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
continue;
if (land.lnd_ship >= 0 || land.lnd_land >= 0)
continue;
rel = getrel(getnatp(land.lnd_own), plane_owner);
if (rel > HOSTILE)
if (getrel(getnatp(land.lnd_own), plane_owner) > HOSTILE)
continue;
flak = aaf * 1.5 * land.lnd_effic / 100.0;
ngun += flak;