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

(gen_power, addtopow): Call addtopow() directly on item arrays instead

Browse source 
of copies made by getvec().  This is obviously correct, since there
are no writes.
This commit is contained in:
Markus Armbruster 2004-03-05 13:20:11 +00:00
parent 733aff63ed
commit e6ffdb71ee
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ struct powsort {
natid cnum; natid cnum;
}; };
static void addtopow(register int *vec, register struct powstr *pow); static void addtopow(register short *vec, register struct powstr *pow);
static void gen_power(void); static void gen_power(void);
static void out5(double value, int round_val, int round_flag); static void out5(double value, int round_val, int round_flag);
static int powcmp(struct powsort *p1, struct powsort *p2); static int powcmp(struct powsort *p1, struct powsort *p2);
@ -237,7 +237,6 @@ gen_power(void)
struct powstr powbuf[MAXNOC]; struct powstr powbuf[MAXNOC];
struct nstr_item ni; struct nstr_item ni;
struct nstr_sect ns; struct nstr_sect ns;
int vec[I_MAX + 1];
struct powsort order[MAXNOC]; struct powsort order[MAXNOC];
struct natstr *natp; struct natstr *natp;
float f; float f;
@ -251,16 +250,14 @@ gen_power(void)
pow = &powbuf[sect.sct_own]; pow = &powbuf[sect.sct_own];
pow->p_sects += 1.0; pow->p_sects += 1.0;
pow->p_effic += sect.sct_effic; pow->p_effic += sect.sct_effic;
getvec(VT_ITEM, vec, (s_char *)&sect, EF_SECTOR); addtopow(sect.sct_item, pow);
addtopow(vec, pow);
} }
snxtitem_all(&ni, EF_LAND); snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (s_char *)&land)) { while (nxtitem(&ni, (s_char *)&land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
pow = &powbuf[land.lnd_own]; pow = &powbuf[land.lnd_own];
getvec(VT_ITEM, vec, (s_char *)&land, EF_LAND); addtopow(land.lnd_item, pow);
addtopow(vec, pow);
if (opt_NEWPOWER == 0) { if (opt_NEWPOWER == 0) {
pow->p_power += lchr[(int)land.lnd_type].l_lcm / 10.0; pow->p_power += lchr[(int)land.lnd_type].l_lcm / 10.0;
pow->p_power += lchr[(int)land.lnd_type].l_hcm / 5.0; pow->p_power += lchr[(int)land.lnd_type].l_hcm / 5.0;
@ -278,8 +275,7 @@ gen_power(void)
if (ship.shp_own == 0) if (ship.shp_own == 0)
continue; continue;
pow = &powbuf[ship.shp_own]; pow = &powbuf[ship.shp_own];
getvec(VT_ITEM, vec, (s_char *)&ship, EF_SHIP); addtopow(ship.shp_item, pow);
addtopow(vec, pow);
if (opt_NEWPOWER == 0) { if (opt_NEWPOWER == 0) {
pow->p_power += mchr[(int)ship.shp_type].m_lcm / 10.0; pow->p_power += mchr[(int)ship.shp_type].m_lcm / 10.0;
pow->p_power += mchr[(int)ship.shp_type].m_hcm / 5.0; pow->p_power += mchr[(int)ship.shp_type].m_hcm / 5.0;
@ -391,7 +387,7 @@ powcmp(struct powsort *p1, struct powsort *p2)
} }
static void static void
addtopow(register int *vec, register struct powstr *pow) addtopow(short *vec, struct powstr *pow)
{ {
pow->p_civil += vec[I_CIVIL]; pow->p_civil += vec[I_CIVIL];
pow->p_milit += vec[I_MILIT]; pow->p_milit += vec[I_MILIT];