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

Factor out ship usable gun calculation into shp_usable_gun()

Browse source
This commit is contained in:
Markus Armbruster 2008-03-03 20:33:54 +01:00
parent ffab089c61
commit 4849600cd5
5 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -837,8 +837,8 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
rel = getrel(getnatp(ship.shp_own), plane_owner);
if (rel > HOSTILE)
continue;
shell = gun = 0;
gun = MIN(ship.shp_item[I_GUN], ship.shp_glim);
shell = 0;
gun = shp_usable_guns(&ship);
if (gun) {
shell = ship.shp_item[I_SHELL];
if (shell <= 0) {