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

8
src/lib/subs/detonate.c
View file

@ -146,7 +146,7 @@ detonate(struct plnstr *pp, int x, int y)
}
}
snxtitem_dist(&ni, EF_PLANE, x, y, rad);
while (nxtitem(&ni, (caddr_t)&plane)) {
while (nxtitem(&ni, &plane)) {
/* Nukes falling on water affect only 1 sector */
if ((plane.pln_x != x) && issea)
continue;
@ -197,7 +197,7 @@ detonate(struct plnstr *pp, int x, int y)
putplane(ni.cur, &plane);
}
snxtitem_dist(&ni, EF_LAND, x, y, rad);
while (nxtitem(&ni, (caddr_t)&land)) {
while (nxtitem(&ni, &land)) {
/* Nukes falling on water affect only 1 sector */
if ((land.lnd_x != x) && issea)
continue;
@ -244,7 +244,7 @@ detonate(struct plnstr *pp, int x, int y)
putland(land.lnd_uid, &land);
}
snxtitem_dist(&ni, EF_SHIP, x, y, rad);
while (nxtitem(&ni, (caddr_t)&ship)) {
while (nxtitem(&ni, &ship)) {
/* Nukes falling on water affect only 1 sector */
if ((ship.shp_x != x) && issea)
continue;
@ -285,7 +285,7 @@ detonate(struct plnstr *pp, int x, int y)
putship(ship.shp_uid, &ship);
}
snxtitem_dist(&ni, EF_NUKE, x, y, rad);
while (nxtitem(&ni, (caddr_t)&nuke)) {
while (nxtitem(&ni, &nuke)) {
/* Nukes falling on water affect only 1 sector */
if ((nuke.nuk_x != x) && issea)
continue;

2
src/lib/subs/fortdef.c
View file

@ -82,7 +82,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
return 0;
eff = 1.0;
snxtitem_dist(&ni, EF_SHIP, x, y, 8);
while (nxtitem(&ni, (caddr_t)&ship) && eff > 0.30) {
while (nxtitem(&ni, &ship) && eff > 0.30) {
if (ship.shp_own == att)
continue;
if (ship.shp_own == 0)

2
src/lib/subs/nxtitem.c
View file

@ -46,7 +46,7 @@
#include "prototypes.h"
int
nxtitem(struct nstr_item *np, caddr_t ptr)
nxtitem(struct nstr_item *np, void *ptr)
{
struct genitem *gp;
int selected;

2
src/lib/subs/nxtsct.c
View file

@ -70,7 +70,7 @@ nxtsct(register struct nstr_sect *np, struct sctstr *sp)
continue;
}
np->id = sctoff(np->x, np->y);
if (!np->read(EF_SECTOR, np->id, (caddr_t)sp))
if (!np->read(EF_SECTOR, np->id, sp))
continue;
if (np->ncond == 0)
return 1;

4
src/lib/subs/radmap.c
View file

@ -136,7 +136,7 @@ radmap2(int owner,
if (!pr_flag)
return;
snxtitem_dist(&ni, EF_PLANE, cx, cy, range);
while (nxtitem(&ni, (caddr_t)&plane)) {
while (nxtitem(&ni, &plane)) {
if (plane.pln_own == 0)
continue;
/* Used to have 'ghosts' when scanning whole world --ts */
@ -149,7 +149,7 @@ radmap2(int owner,
}
}
snxtitem_dist(&ni, EF_SHIP, cx, cy, range);
while (nxtitem(&ni, (caddr_t)&ship)) {
while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0)
continue;
/* Used to have 'ghosts' when scanning whole world --ts */

8
src/lib/subs/satmap.c
View file

@ -159,7 +159,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
pr(" own shp# ship type sector eff\n");
}
}
while (nxtitem(&ni, (caddr_t)&ship)) {
while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0)
continue;
if ((mchr[(int)ship.shp_type].m_flags & M_SUB) &&
@ -214,7 +214,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
prdate();
pr(" own lnd# unit type sector eff\n");
}
while (nxtitem(&ni, (caddr_t)&land)) {
while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0)
continue;
if (!chance((double)land.lnd_effic / 20.0))
@ -308,7 +308,7 @@ satdisp(struct sctstr *sp, int acc, int showstuff)
return;
snxtitem_xy(&ni, EF_SHIP, sp->sct_x, sp->sct_y);
first = 1;
while (nxtitem(&ni, (caddr_t)&ship)) {
while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0)
continue;
if (mchr[(int)ship.shp_type].m_flags & M_SUB)
@ -335,7 +335,7 @@ satdisp(struct sctstr *sp, int acc, int showstuff)
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
first = 1;
while (nxtitem(&ni, (caddr_t)&land)) {
while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0)
continue;
if (!chance((double)land.lnd_effic / 20.0))

2
src/lib/subs/shpsub.c
View file

@ -932,7 +932,7 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget)
snxtitem_dist(&ni, EF_SHIP, dx, dy, 1);
while (nxtitem(&ni, (caddr_t)&ship)) {
while (nxtitem(&ni, &ship)) {
if (!ship.shp_own)
continue;

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)

2
src/lib/subs/wu.c
View file

@ -144,7 +144,7 @@ typed_wu(natid from, natid to, s_char *message, int type)
tel.tel_length = len;
tel.tel_type = type;
#if !defined(_WIN32)
iov[0].iov_base = (caddr_t)&tel;
iov[0].iov_base = &tel;
iov[0].iov_len = sizeof(tel);
iov[1].iov_base = message;
iov[1].iov_len = len;