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

Type of gift()'s generic pointer parameter was fixed in the previous

Browse source 
revision of src/lib/commands/load.c, change callers.
This commit is contained in:
Markus Armbruster 2006-03-28 19:20:08 +00:00
parent 5c5175ac13
commit 06b669924a
2 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/lib/commands/load.c
View file

@ -459,7 +459,7 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
} }
sprintf(buf, "loaded on your %s at %s", sprintf(buf, "loaded on your %s at %s",
prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own)); prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
gift(sp->shp_own, player->cnum, (s_char *)&pln, EF_PLANE, buf); gift(sp->shp_own, player->cnum, &pln, EF_PLANE, buf);
makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x, makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x,
pln.pln_y); pln.pln_y);
pln.pln_own = sp->shp_own; pln.pln_own = sp->shp_own;
@ -477,8 +477,7 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
sprintf(buf, "unloaded in your %s at %s", sprintf(buf, "unloaded in your %s at %s",
dchr[sectp->sct_type].d_name, dchr[sectp->sct_type].d_name,
xyas(sectp->sct_x, sectp->sct_y, sectp->sct_own)); xyas(sectp->sct_x, sectp->sct_y, sectp->sct_own));
gift(sectp->sct_own, player->cnum, (s_char *)&pln, gift(sectp->sct_own, player->cnum, &pln, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x, makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x,
pln.pln_y); pln.pln_y);
pln.pln_own = sectp->sct_own; pln.pln_own = sectp->sct_own;
@ -630,7 +629,7 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
} }
sprintf(buf, "loaded on your %s at %s", sprintf(buf, "loaded on your %s at %s",
prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own)); prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
gift(sp->shp_own, player->cnum, (s_char *)&land, EF_LAND, buf); gift(sp->shp_own, player->cnum, &land, EF_LAND, buf);
makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x, makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x,
land.lnd_y); land.lnd_y);
land.lnd_own = sp->shp_own; land.lnd_own = sp->shp_own;
@ -652,8 +651,7 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
if (plane.pln_land != land.lnd_uid) if (plane.pln_land != land.lnd_uid)
continue; continue;
sprintf(buf, "loaded on %s", prship(sp)); sprintf(buf, "loaded on %s", prship(sp));
gift(sp->shp_own, player->cnum, (s_char *)&plane, gift(sp->shp_own, player->cnum, &plane, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, plane.pln_own, plane.pln_uid, makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y); plane.pln_x, plane.pln_y);
plane.pln_own = sp->shp_own; plane.pln_own = sp->shp_own;
@ -669,8 +667,7 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
/* Spies are unloaded quietly, others aren't */ /* Spies are unloaded quietly, others aren't */
if (!(lchr[(int)land.lnd_type].l_flags & L_SPY)) { if (!(lchr[(int)land.lnd_type].l_flags & L_SPY)) {
gift(sectp->sct_own, player->cnum, (s_char *)&land, gift(sectp->sct_own, player->cnum, &land, EF_LAND, buf);
EF_LAND, buf);
makelost(EF_LAND, land.lnd_own, land.lnd_uid, makelost(EF_LAND, land.lnd_own, land.lnd_uid,
land.lnd_x, land.lnd_y); land.lnd_x, land.lnd_y);
land.lnd_own = sectp->sct_own; land.lnd_own = sectp->sct_own;
@ -696,8 +693,7 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
sprintf(buf, "unloaded at %s", sprintf(buf, "unloaded at %s",
xyas(plane.pln_x, plane.pln_y, xyas(plane.pln_x, plane.pln_y,
sectp->sct_own)); sectp->sct_own));
gift(sectp->sct_own, player->cnum, (s_char *)&plane, gift(sectp->sct_own, player->cnum, &plane, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, plane.pln_own, plane.pln_uid, makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y); plane.pln_x, plane.pln_y);
plane.pln_own = sectp->sct_own; plane.pln_own = sectp->sct_own;
@ -877,7 +873,7 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
} }
sprintf(buf, "loaded on %s at %s", sprintf(buf, "loaded on %s at %s",
prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own)); prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
gift(lp->lnd_own, player->cnum, (s_char *)&pln, EF_PLANE, buf); gift(lp->lnd_own, player->cnum, &pln, EF_PLANE, buf);
makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x, makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x,
pln.pln_y); pln.pln_y);
pln.pln_own = lp->lnd_own; pln.pln_own = lp->lnd_own;
@ -893,8 +889,7 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
} }
sprintf(buf, "unloaded at your sector at %s", sprintf(buf, "unloaded at your sector at %s",
xyas(sectp->sct_x, sectp->sct_y, sectp->sct_own)); xyas(sectp->sct_x, sectp->sct_y, sectp->sct_own));
gift(sectp->sct_own, player->cnum, (s_char *)&pln, gift(sectp->sct_own, player->cnum, &pln, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x, makelost(EF_PLANE, pln.pln_own, pln.pln_uid, pln.pln_x,
pln.pln_y); pln.pln_y);
pln.pln_own = sectp->sct_own; pln.pln_own = sectp->sct_own;
@ -1092,7 +1087,7 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
} }
sprintf(buf, "loaded on your %s at %s", sprintf(buf, "loaded on your %s at %s",
prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own)); prland(lp), xyas(lp->lnd_x, lp->lnd_y, lp->lnd_own));
gift(lp->lnd_own, player->cnum, (s_char *)&land, EF_LAND, buf); gift(lp->lnd_own, player->cnum, &land, EF_LAND, buf);
makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x, makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x,
land.lnd_y); land.lnd_y);
land.lnd_own = lp->lnd_own; land.lnd_own = lp->lnd_own;
@ -1114,8 +1109,7 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
if (plane.pln_land != land.lnd_uid) if (plane.pln_land != land.lnd_uid)
continue; continue;
sprintf(buf, "loaded on %s", prland(lp)); sprintf(buf, "loaded on %s", prland(lp));
gift(lp->lnd_own, player->cnum, (s_char *)&plane, gift(lp->lnd_own, player->cnum, &plane, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, plane.pln_own, plane.pln_uid, makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y); plane.pln_x, plane.pln_y);
plane.pln_own = lp->lnd_own; plane.pln_own = lp->lnd_own;
@ -1128,8 +1122,7 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
sprintf(buf, "unloaded in your %s at %s", sprintf(buf, "unloaded in your %s at %s",
dchr[sectp->sct_type].d_name, dchr[sectp->sct_type].d_name,
xyas(sectp->sct_x, sectp->sct_y, sectp->sct_own)); xyas(sectp->sct_x, sectp->sct_y, sectp->sct_own));
gift(sectp->sct_own, player->cnum, (s_char *)&land, gift(sectp->sct_own, player->cnum, &land, EF_LAND, buf);
EF_LAND, buf);
makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x, makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x,
land.lnd_y); land.lnd_y);
land.lnd_own = sectp->sct_own; land.lnd_own = sectp->sct_own;
@ -1147,8 +1140,7 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
continue; continue;
sprintf(buf, "unloaded at %s", sprintf(buf, "unloaded at %s",
xyas(plane.pln_x, plane.pln_y, sectp->sct_own)); xyas(plane.pln_x, plane.pln_y, sectp->sct_own));
gift(sectp->sct_own, player->cnum, (s_char *)&plane, gift(sectp->sct_own, player->cnum, &plane, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, plane.pln_own, plane.pln_uid, makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y); plane.pln_x, plane.pln_y);
plane.pln_own = sectp->sct_own; plane.pln_own = sectp->sct_own;

6
src/lib/commands/tend.c
View file

@ -269,8 +269,7 @@ tend_land(struct shpstr *tenderp, s_char *units)
sprintf(buf, "loaded on your %s at %s", sprintf(buf, "loaded on your %s at %s",
prship(&target), xyas(target.shp_x, target.shp_y, prship(&target), xyas(target.shp_x, target.shp_y,
target.shp_own)); target.shp_own));
gift(target.shp_own, player->cnum, (s_char *)&land, gift(target.shp_own, player->cnum, &land, EF_LAND, buf);
EF_LAND, buf);
makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x, makelost(EF_LAND, land.lnd_own, land.lnd_uid, land.lnd_x,
land.lnd_y); land.lnd_y);
land.lnd_own = target.shp_own; land.lnd_own = target.shp_own;
@ -292,8 +291,7 @@ tend_land(struct shpstr *tenderp, s_char *units)
if (plane.pln_land != land.lnd_uid) if (plane.pln_land != land.lnd_uid)
continue; continue;
sprintf(buf, "loaded on %s", prship(&target)); sprintf(buf, "loaded on %s", prship(&target));
gift(target.shp_own, player->cnum, (s_char *)&plane, gift(target.shp_own, player->cnum, &plane, EF_PLANE, buf);
EF_PLANE, buf);
makelost(EF_PLANE, plane.pln_own, plane.pln_uid, makelost(EF_PLANE, plane.pln_own, plane.pln_uid,
plane.pln_x, plane.pln_y); plane.pln_x, plane.pln_y);
plane.pln_own = target.shp_own; plane.pln_own = target.shp_own;