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

(tran_nuke, tran_plane, set, sell, move): Use military_control().

Browse source 
(tran_plane): Fix message for attempting to transport a plane in a
sector not owned by the player.
This commit is contained in:
Markus Armbruster 2004-08-19 18:12:28 +00:00
parent 766538bc2f
commit ef0060ec57
4 changed files with 17 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/commands/set.c
View file

@ -96,24 +96,9 @@ set(void)
if (!player->owner && !player->god)
continue;
getsect(item.gen.trg_x, item.gen.trg_y, &sect);
/*
* military control necessary to sell
* goodies in occupied territory.
*/
if (sect.sct_oldown != player->cnum && !player->god) {
int tot_mil = 0;
struct nstr_item ni;
struct lndstr land;
snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y);
while (nxtitem(&ni, (s_char *)&land)) {
if (land.lnd_own == player->cnum)
tot_mil += total_mil(&land);
}
if (tot_mil + sect.sct_item[I_MILIT] * 10
< sect.sct_item[I_CIVIL]) {
pr("Military control required to sell goods.\n");
return RET_FAIL;
}
if (!military_control(&sect)) {
pr("Military control required to sell goods.\n");
return RET_FAIL;
}
trade.trd_type = type;
sprintf(prompt, "%s #%d; Price? ",