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

(scra): Work directly on item arrays instead of copies made by

Browse source 
getvec().  This is safe, because the old code made single copies and
always flushed them back into the unit structures before flushing
those.  To do: obey ITEM_MAX.
This commit is contained in:
Markus Armbruster 2004-03-09 19:32:43 +00:00
parent ab482ecd39
commit 9d30b2d0f6
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/lib/commands/scra.c
View file

@ -57,7 +57,6 @@ scra(void)
{ {
struct nstr_item ni; struct nstr_item ni;
union item_u item; union item_u item;
int vec[I_MAX + 1];
int type; int type;
struct sctstr sect; struct sctstr sect;
struct mchrstr *mp; struct mchrstr *mp;
@ -171,7 +170,6 @@ scra(void)
getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY)) getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY))
continue; continue;
} }
getvec(VT_ITEM, vec, (s_char *)&sect, EF_SECTOR);
if (type == EF_SHIP) { if (type == EF_SHIP) {
eff = ((float)item.ship.shp_effic / 100.0); eff = ((float)item.ship.shp_effic / 100.0);
mp = &mchr[(int)item.ship.shp_type]; mp = &mchr[(int)item.ship.shp_type];
@ -188,11 +186,12 @@ scra(void)
} }
} }
pr("%s", prship(&item.ship)); pr("%s", prship(&item.ship));
/* FIXME obey ITEM_MAX */
for (i = 1; i <= I_MAX; i++) { for (i = 1; i <= I_MAX; i++) {
vec[i] += item.ship.shp_item[i]; sect.sct_item[i] += item.ship.shp_item[i];
} }
vec[I_LCM] += mp->m_lcm * 2 / 3 * eff; sect.sct_item[I_LCM] += mp->m_lcm * 2 / 3 * eff;
vec[I_HCM] += mp->m_hcm * 2 / 3 * eff; sect.sct_item[I_HCM] += mp->m_hcm * 2 / 3 * eff;
getsect(item.ship.shp_x, item.ship.shp_y, &sect2); getsect(item.ship.shp_x, item.ship.shp_y, &sect2);
snxtitem_all(&ni2, EF_PLANE); snxtitem_all(&ni2, EF_PLANE);
while (nxtitem(&ni2, (s_char *)&plane)) { while (nxtitem(&ni2, (s_char *)&plane)) {
@ -254,15 +253,12 @@ scra(void)
eff = ((float)item.land.lnd_effic / 100.0); eff = ((float)item.land.lnd_effic / 100.0);
lp = &lchr[(int)item.land.lnd_type]; lp = &lchr[(int)item.land.lnd_type];
pr("%s", prland(&item.land)); pr("%s", prland(&item.land));
/* FIXME obey ITEM_MAX */
for (i = 1; i <= I_MAX; i++) { for (i = 1; i <= I_MAX; i++) {
vec[i] += item.land.lnd_item[i]; sect.sct_item[i] += item.land.lnd_item[i];
} }
/* Military, guns and shells are not required to build land units */ sect.sct_item[I_LCM] += lp->l_lcm * 2 / 3 * eff;
/* vec[I_MILIT] += total_mil(&item.land);*/ sect.sct_item[I_HCM] += lp->l_hcm * 2 / 3 * eff;
/* vec[I_GUN] += lp->l_gun * 2 / 3 * eff;*/
/* vec[I_SHELL] += lp->l_shell * 2 / 3 * eff;*/
vec[I_LCM] += lp->l_lcm * 2 / 3 * eff;
vec[I_HCM] += lp->l_hcm * 2 / 3 * eff;
getsect(item.land.lnd_x, item.land.lnd_y, &sect2); getsect(item.land.lnd_x, item.land.lnd_y, &sect2);
snxtitem_all(&ni2, EF_LAND); snxtitem_all(&ni2, EF_LAND);
@ -326,9 +322,10 @@ scra(void)
eff = ((float)item.land.lnd_effic / 100.0); eff = ((float)item.land.lnd_effic / 100.0);
pp = &plchr[(int)item.plane.pln_type]; pp = &plchr[(int)item.plane.pln_type];
pr("%s", prplane(&item.plane)); pr("%s", prplane(&item.plane));
vec[I_LCM] += pp->pl_lcm * 2 / 3 * eff; /* FIXME obey ITEM_MAX */
vec[I_HCM] += pp->pl_hcm * 2 / 3 * eff; sect.sct_item[I_LCM] += pp->pl_lcm * 2 / 3 * eff;
vec[I_MILIT] += pp->pl_crew; sect.sct_item[I_HCM] += pp->pl_hcm * 2 / 3 * eff;
sect.sct_item[I_MILIT] += pp->pl_crew;
makelost(EF_PLANE, item.plane.pln_own, item.plane.pln_uid, makelost(EF_PLANE, item.plane.pln_own, item.plane.pln_uid,
item.plane.pln_x, item.plane.pln_y); item.plane.pln_x, item.plane.pln_y);
item.plane.pln_own = 0; item.plane.pln_own = 0;
@ -336,7 +333,6 @@ scra(void)
} }
pr(" scrapped in %s\n", pr(" scrapped in %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));
putvec(VT_ITEM, vec, (s_char *)&sect, EF_SECTOR);
putsect(&sect); putsect(&sect);
} }
return RET_OK; return RET_OK;