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

10
src/lib/commands/cede.c
View file

@ -213,7 +213,7 @@ grab_sect(register struct sctstr *sp, natid to)
pp = &p;
snxtitem_xy(&ni, EF_PLANE, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, (caddr_t)pp)) {
while (nxtitem(&ni, pp)) {
if (pp->pln_own == 0)
continue;
if (pp->pln_ship >= 0)
@ -236,7 +236,7 @@ grab_sect(register struct sctstr *sp, natid to)
np = &nuk;
snxtitem_xy(&ni, EF_NUKE, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, (caddr_t)np)) {
while (nxtitem(&ni, np)) {
if (np->nuk_own == 0)
continue;
@ -251,7 +251,7 @@ grab_sect(register struct sctstr *sp, natid to)
lp = &l;
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, (caddr_t)lp)) {
while (nxtitem(&ni, lp)) {
if (lp->lnd_own == 0)
continue;
if (lp->lnd_ship == 0)
@ -342,7 +342,7 @@ grab_ship(register struct shpstr *sp, natid to)
pp = &p;
snxtitem_xy(&ni, EF_PLANE, sp->shp_x, sp->shp_y);
while (nxtitem(&ni, (caddr_t)pp)) {
while (nxtitem(&ni, pp)) {
if (pp->pln_own == 0)
continue;
if (pp->pln_flags & PLN_LAUNCHED)
@ -365,7 +365,7 @@ grab_ship(register struct shpstr *sp, natid to)
lp = &l;
snxtitem_xy(&ni, EF_LAND, sp->shp_x, sp->shp_y);
while (nxtitem(&ni, (caddr_t)lp)) {
while (nxtitem(&ni, lp)) {
if (lp->lnd_own == 0)
continue;
if (lp->lnd_ship != sp->shp_uid)