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/commands/bomb.c
View file

@ -523,8 +523,8 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
if ((plp->pcp->pl_flags & P_A) && !on_shiplist(shipno, head))
continue;
shell = gun = 0;
gun = MIN(ship.shp_item[I_GUN], ship.shp_glim);
shell = 0;
gun = shp_usable_guns(&ship);
if (gun > 0) {
shell = ship.shp_item[I_SHELL];
if (shell <= 0)