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

Use new snxtitem_cargo() to simplify a couple of loops

Browse source 
Change snxtitem_all() loops that skip everything but a carrier's cargo
to use snxtitem_cargo() in scra(), scuttle_ship(), scuttle_land(),
takeover_ship(), takeover_land(), trade_desc(), feed_ship().
This commit is contained in:
Markus Armbruster 2008-09-12 21:22:14 -04:00
parent 3cf29456fe
commit 2a9b89693e
5 changed files with 138 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/subs/takeover.c
View file

@ -229,12 +229,8 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
pp = &p;
lp = &llp;
/* Take over planes */
snxtitem_all(&ni, EF_PLANE);
snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, pp)) {
if (pp->pln_ship != sp->shp_uid)
continue;
if (pp->pln_own == 0)
continue;
if (hostile) {
if (pp->pln_effic > PLANE_MINEFF)
pp->pln_effic = PLANE_MINEFF;
@ -249,14 +245,9 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
putplane(pp->pln_uid, pp);
}
/* Take over land units */
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, lp)) {
if (lp->lnd_ship != sp->shp_uid)
continue;
if (lp->lnd_own == 0)
continue;
snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, lp))
takeover_land(lp, newown, hostile);
}
putship(sp->shp_uid, sp);
}
@ -285,12 +276,8 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
pp = &p;
lp = &llp;
/* Take over planes */
snxtitem_all(&ni, EF_PLANE);
snxtitem_cargo(&ni, EF_PLANE, EF_LAND, landp->lnd_uid);
while (nxtitem(&ni, pp)) {
if (pp->pln_land != landp->lnd_uid)
continue;
if (pp->pln_own == 0)
continue;
if (hostile) {
if (pp->pln_effic > PLANE_MINEFF)
pp->pln_effic = PLANE_MINEFF;
@ -305,13 +292,8 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
putplane(pp->pln_uid, pp);
}
/* Take over land units */
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, lp)) {
if (lp->lnd_land != landp->lnd_uid)
continue;
if (lp->lnd_own == 0)
continue;
snxtitem_cargo(&ni, EF_LAND, EF_LAND, landp->lnd_uid);
while (nxtitem(&ni, lp))
takeover_land(lp, newown, hostile);
}
putland(landp->lnd_uid, landp);
}