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

config: Generalize unit build materials storage

Browse source 
Use a single array member instead of multiple scalar members.  Only
the array elements that replace scalar members are can be non-zero for
now.

This is a first step to permitting more build materials.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-05-27 14:17:08 +02:00
parent 68c7c08a58
commit da05484d8b
17 changed files with 79 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/commands/powe.c
View file

@ -30,7 +30,7 @@
* Dave Pare
* Ken Stevens, 1995
* Steve McClure, 1998-2000
* Markus Armbruster, 2004-2013
* Markus Armbruster, 2004-2016
* Ron Koenderink, 2005-2008
*/
@ -244,8 +244,10 @@ gen_power(struct powstr *powbuf, int save)
continue;
pow = &powbuf[land.lnd_own];
addtopow(land.lnd_item, pow);
f = (lchr[(int)land.lnd_type].l_lcm / 10.0) * (land.lnd_effic / 100.0);
f += (lchr[(int)land.lnd_type].l_hcm / 10.0) * (land.lnd_effic / 100.0);
f = (lchr[land.lnd_type].l_mat[I_LCM] / 10.0)
* (land.lnd_effic / 100.0);
f += (lchr[land.lnd_type].l_mat[I_HCM] / 10.0)
* (land.lnd_effic / 100.0);
pow->p_power += f * 2;
if (!(lchr[(int)land.lnd_type].l_flags & L_SPY))
pow->p_units += 1.0;
@ -256,8 +258,10 @@ gen_power(struct powstr *powbuf, int save)
continue;
pow = &powbuf[ship.shp_own];
addtopow(ship.shp_item, pow);
f = (mchr[(int)ship.shp_type].m_lcm / 10.0) * (ship.shp_effic / 100.0);
f += (mchr[(int)ship.shp_type].m_hcm / 10.0) * (ship.shp_effic / 100.0);
f = (mchr[ship.shp_type].m_mat[I_LCM] / 10.0)
* (ship.shp_effic / 100.0);
f += (mchr[ship.shp_type].m_mat[I_HCM] / 10.0)
* (ship.shp_effic / 100.0);
pow->p_power += f * 2;
pow->p_ships += 1.0;
}