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

Factor load_comm_ok() out of load_comm_ship() and load_comm_land()

Browse source 
Functional change: attempting to load or unload foreign civilians no
longer fails command.
This commit is contained in:
Markus Armbruster 2009-01-04 11:57:26 +01:00
parent bf2fd042ab
commit 430ce903d3
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -321,6 +321,21 @@ lload(void)
return RET_OK; return RET_OK;
} }
static int
load_comm_ok(struct sctstr *sectp, i_type item, int move_amt)
{
if (!move_amt)
return 0;
if (sectp->sct_oldown != player->cnum && item == I_CIVIL) {
pr("%s civilians refuse to %s at %s!\n",
move_amt < 0 ? "Your" : "Foreign",
move_amt < 0 ? "disembark" : "board",
xyas(sectp->sct_x, sectp->sct_y, player->cnum));
return 0;
}
return 1;
}
void void
gift(natid givee, natid giver, void *ptr, char *mesg) gift(natid givee, natid giver, void *ptr, char *mesg)
{ {
@ -676,16 +691,8 @@ load_comm_ship(struct sctstr *sectp, struct shpstr *sp,
move_amt = sect_amt; move_amt = sect_amt;
if (move_amt < sect_amt - ITEM_MAX) if (move_amt < sect_amt - ITEM_MAX)
move_amt = sect_amt - ITEM_MAX; move_amt = sect_amt - ITEM_MAX;
if (!move_amt) if (!load_comm_ok(sectp, item, move_amt))
return RET_OK; return RET_OK;
if (sectp->sct_oldown != player->cnum && item == I_CIVIL) {
pr("%s civilians refuse to %s at %s!\n",
move_amt < 0 ? "Your" : "Foreign",
move_amt < 0 ? "disembark" : "board",
xyas(sectp->sct_x, sectp->sct_y, player->cnum));
return RET_FAIL;
}
if (!want_to_abandon(sectp, item, move_amt, 0)) if (!want_to_abandon(sectp, item, move_amt, 0))
return RET_FAIL; return RET_FAIL;
if (!still_ok_ship(sectp, sp)) if (!still_ok_ship(sectp, sp))
@ -857,20 +864,13 @@ load_comm_land(struct sctstr *sectp, struct lndstr *lp,
move_amt = sect_amt; move_amt = sect_amt;
if (move_amt < sect_amt - ITEM_MAX) if (move_amt < sect_amt - ITEM_MAX)
move_amt = sect_amt - ITEM_MAX; move_amt = sect_amt - ITEM_MAX;
if (!move_amt) if (!load_comm_ok(sectp, item, move_amt))
return RET_OK; return RET_OK;
if (sectp->sct_own != player->cnum && move_amt > 0) { if (sectp->sct_own != player->cnum && move_amt > 0) {
pr("Sector %s is not yours.\n", pr("Sector %s is not yours.\n",
xyas(lp->lnd_x, lp->lnd_y, player->cnum)); xyas(lp->lnd_x, lp->lnd_y, player->cnum));
return RET_FAIL; return RET_FAIL;
} }
if (sectp->sct_oldown != player->cnum && item == I_CIVIL) {
pr("%s civilians refuse to %s at %s!\n",
move_amt < 0 ? "Your" : "Foreign",
move_amt < 0 ? "disembark" : "board",
xyas(sectp->sct_x, sectp->sct_y, player->cnum));
return RET_FAIL;
}
sectp->sct_item[item] = sect_amt - move_amt; sectp->sct_item[item] = sect_amt - move_amt;
lp->lnd_item[item] = land_amt + move_amt; lp->lnd_item[item] = land_amt + move_amt;