(ontradingblock, trdswitchown): Second parameter is a generic pointer,
change it from int * to void *. Callers changed not to cast to int *.
This commit is contained in:
parent
05f64e8c3f
commit
79714720cc
13 changed files with 21 additions and 23 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue