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

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;