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

caddr_t is obsolete. Replace by void *, except for struct empfile

Browse source 
member cache, which becomes char * to keep pointer arithmetic simple.
This commit is contained in:
Markus Armbruster 2004-08-23 18:29:44 +00:00
parent 059353e957
commit dcfd251f95
40 changed files with 80 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ takeover(register struct sctstr *sp, natid newown)
pp = &p;
/* Take over planes */
snxtitem_dist(&ni, EF_PLANE, sp->sct_x, sp->sct_y, 0);
while (nxtitem(&ni, (caddr_t)pp)) {
while (nxtitem(&ni, pp)) {
if (pp->pln_own != sp->sct_own)
continue;
takeover_plane(pp, newown);
@ -80,7 +80,7 @@ takeover(register struct sctstr *sp, natid newown)
/* Take over land units */
lp = &land;
snxtitem_dist(&ni, EF_LAND, sp->sct_x, sp->sct_y, 0);
while (nxtitem(&ni, (caddr_t)lp)) {
while (nxtitem(&ni, lp)) {
if ((lp->lnd_own == newown) || (lp->lnd_own == 0))
continue;
if (lp->lnd_own != sp->sct_own)
@ -232,7 +232,7 @@ takeover_ship(register struct shpstr *sp, natid newown, int hostile)
lp = &llp;
/* Take over planes */
snxtitem_all(&ni, EF_PLANE);
while (nxtitem(&ni, (caddr_t)pp)) {
while (nxtitem(&ni, pp)) {
if (pp->pln_ship != sp->shp_uid)
continue;
if (pp->pln_own == 0)
@ -255,7 +255,7 @@ takeover_ship(register struct shpstr *sp, natid newown, int hostile)
}
/* Take over land units */
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (caddr_t)lp)) {
while (nxtitem(&ni, lp)) {
if (lp->lnd_ship != sp->shp_uid)
continue;
if (lp->lnd_own == 0)
@ -295,7 +295,7 @@ takeover_land(register struct lndstr *landp, natid newown, int hostile)
lp = &llp;
/* Take over planes */
snxtitem_all(&ni, EF_PLANE);
while (nxtitem(&ni, (caddr_t)pp)) {
while (nxtitem(&ni, pp)) {
if (pp->pln_land != landp->lnd_uid)
continue;
if (pp->pln_own == 0)
@ -318,7 +318,7 @@ takeover_land(register struct lndstr *landp, natid newown, int hostile)
}
/* Take over land units */
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (caddr_t)lp)) {
while (nxtitem(&ni, lp)) {
if (lp->lnd_land != landp->lnd_uid)
continue;
if (lp->lnd_own == 0)