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

(ontradingblock, trdswitchown): Second parameter is a generic pointer,

Browse source 
change it from int * to void *.  Callers changed not to cast to int *.
This commit is contained in:
Markus Armbruster 2006-03-25 15:11:17 +00:00
parent 05f64e8c3f
commit 79714720cc
13 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/prototypes.h
View file

@ -77,8 +77,8 @@ extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
extern s_char *prsub(struct shpstr *);
extern int check_trade(void);
extern int ontradingblock(int, int *);
extern void trdswitchown(int, int *, int);
extern int ontradingblock(int, void *);
extern void trdswitchown(int, void *, int);
/* Commands */
int acce(void);
int add(void);

2
src/lib/commands/arm.c
View file

@ -75,7 +75,7 @@ arm(void)
return RET_FAIL;
}
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, (int *)&pl)) {
if (ontradingblock(EF_PLANE, &pl)) {
pr("You cannot arm/disarm an item on the trading block!\n");
return RET_FAIL;
}

2
src/lib/commands/laun.c
View file

@ -94,7 +94,7 @@ laun(void)
continue;
}
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, (int *)&plane)) {
if (ontradingblock(EF_PLANE, &plane)) {
pr("plane #%d inelligible - it's for sale.\n",
plane.pln_uid);
continue;

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

@ -121,7 +121,7 @@ load(void)
continue;
}
if (opt_MARKET) {
if (ontradingblock(EF_SHIP, (int *)&ship)) {
if (ontradingblock(EF_SHIP, &ship)) {
pr("You cannot load/unload an item on the trading block!\n");
continue;
}
@ -266,7 +266,7 @@ lload(void)
if (sect.sct_own != player->cnum && land.lnd_own != player->cnum)
continue;
if (opt_MARKET) {
if (ontradingblock(EF_LAND, (int *)&land)) {
if (ontradingblock(EF_LAND, &land)) {
pr("You cannot load/unload an item on the trading block!\n");
continue;
}

2
src/lib/commands/scra.c
View file

@ -142,7 +142,7 @@ scra(void)
continue;
if (opt_MARKET) {
if (ontradingblock(type, (int *)&item.ship)) {
if (ontradingblock(type, &item.ship)) {
pr("You cannot scrap an item on the trading block!\n");
continue;
}

2
src/lib/commands/scut.c
View file

@ -209,7 +209,7 @@ scut(void)
if (!player->owner)
continue;
if (opt_MARKET) {
if (ontradingblock(type, (int *)&item.ship)) {
if (ontradingblock(type, &item.ship)) {
pr("You cannot scuttle an item on the trading block!\n");
continue;
}

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

@ -495,8 +495,7 @@ check_trade(void)
}
int
ontradingblock(int type, int *ptr)
/* Generic pointer */
ontradingblock(int type, void *ptr)
{
struct trdstr trade;
union trdgenstr tg;
@ -516,8 +515,7 @@ ontradingblock(int type, int *ptr)
}
void
trdswitchown(int type, int *ptr, int newown)
/* Generic pointer */
trdswitchown(int type, void *ptr, int newown)
{
struct trdstr trade;
union trdgenstr tg;

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

@ -219,7 +219,7 @@ att_get_combat(struct combat *com, int isdef)
}
if (opt_MARKET) {
if (isdef && player->owner &&
ontradingblock(EF_SHIP, (int *)&ship)) {
ontradingblock(EF_SHIP, &ship)) {
pr("%s is on the trading block.\n", prcom(0, com));
return att_combat_init(com, EF_BAD);
}
@ -983,7 +983,7 @@ ask_olist(int combat_mode, struct combat *off, struct combat *def,
}
if (opt_MARKET) {
if (ontradingblock(EF_LAND, (int *)&land)) {
if (ontradingblock(EF_LAND, &land)) {
pr("%s is on the trading block, and cannot %s\n",
prland(&land), att_mode[combat_mode]);
continue;

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

@ -514,7 +514,7 @@ lnd_sel(struct nstr_item *ni, struct emp_qelem *list)
if (!player->owner)
continue;
if (opt_MARKET) {
if (ontradingblock(EF_LAND, (int *)&land)) {
if (ontradingblock(EF_LAND, &land)) {
pr("unit #%d inelligible - it's for sale.\n",
land.lnd_uid);
continue;

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

@ -1009,7 +1009,7 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
}
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, (int *)pp)) {
if (ontradingblock(EF_PLANE, pp)) {
emp_remque(qp);
free(qp);
continue;

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

@ -393,7 +393,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
if (plane.pln_mobil <= 0)
continue;
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, (int *)&plane)) {
if (ontradingblock(EF_PLANE, &plane)) {
pr("plane #%d inelligible - it's for sale.\n",
plane.pln_uid);
continue;

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

@ -82,7 +82,7 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list)
continue;
*/
if (opt_MARKET) {
if (ontradingblock(EF_SHIP, (int *)&ship)) {
if (ontradingblock(EF_SHIP, &ship)) {
pr("ship #%d inelligible - it's for sale.\n",
ship.shp_uid);
continue;

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

@ -199,7 +199,7 @@ takeover_plane(struct plnstr *pp, natid newown)
cname(newown), xyas(pp->pln_x, pp->pln_y, pp->pln_own));
}
if (opt_MARKET)
trdswitchown(EF_PLANE, (int *)pp, newown);
trdswitchown(EF_PLANE, pp, newown);
if (pp->pln_mobil > 0)
pp->pln_mobil = 0;
makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
@ -219,7 +219,7 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
struct lndstr llp;
if (opt_MARKET)
trdswitchown(EF_SHIP, (int *)sp, newown);
trdswitchown(EF_SHIP, sp, newown);
makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
sp->shp_own = newown;
makenotlost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
@ -246,7 +246,7 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
/* Keep track of when this was taken over */
time(&pp->pln_access);
if (opt_MARKET)
trdswitchown(EF_PLANE, (int *)pp, newown);
trdswitchown(EF_PLANE, pp, newown);
pp->pln_mission = 0;
makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
pp->pln_own = newown;
@ -285,7 +285,7 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
/* Keep track of when this was taken over */
time(&landp->lnd_access);
if (opt_MARKET)
trdswitchown(EF_LAND, (int *)landp, newown);
trdswitchown(EF_LAND, landp, newown);
landp->lnd_mission = 0;
makelost(EF_LAND, landp->lnd_own, landp->lnd_uid, landp->lnd_x,
landp->lnd_y);
@ -309,7 +309,7 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
/* Keep track of when this was taken over */
time(&pp->pln_access);
if (opt_MARKET)
trdswitchown(EF_PLANE, (int *)pp, newown);
trdswitchown(EF_PLANE, pp, newown);
pp->pln_mission = 0;
makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
pp->pln_own = newown;