* goodies in occupied territory.
*/
if (!istest && sect.sct_oldown != player->cnum && vtype != I_MILIT) {
- 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 ((sect.sct_item[I_MILIT] + tot_mil) * 10 < sect.sct_item[I_CIVIL]) {
+ if (!military_control(§)) {
pr("Military control required to move goods.\n");
return RET_FAIL;
}
if (price > 1000.0) /* Inf can cause overflow */
price = 1000.0; /* bailey@math-cs.kent.edu */
totalcom = 0;
- /*
- * military control necessary to sell
- * goodies in occupied territory.
- */
- if (sect.sct_oldown != player->cnum) {
- 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(§)) {
+ pr("Military control required to sell goods.\n");
+ return RET_FAIL;
}
if ((amt = sect.sct_item[ip->i_vtype]) == 0) {
pr("You don't have any %s to sell there.\n", ip->i_name);
if (!player->owner && !player->god)
continue;
getsect(item.gen.trg_x, item.gen.trg_y, §);
- /*
- * 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(§)) {
+ pr("Military control required to sell goods.\n");
+ return RET_FAIL;
}
trade.trd_type = type;
sprintf(prompt, "%s #%d; Price? ",
else
return RET_FAIL;
}
- /*
- * military control necessary to move
- * goodies in occupied territory.
- */
- if (sect.sct_oldown != player->cnum) {
- 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 ((sect.sct_item[I_MILIT] + tot_mil) * 10 < sect.sct_item[I_CIVIL]) {
- pr("Military control required to move goods.\n");
- return RET_FAIL;
- }
+ if (!military_control(§)) {
+ pr("Military control required to move nukes.\n");
+ return RET_FAIL;
}
dam = 0;
mcost = move_ground((s_char *)&nuke, §, &endsect,
/* no planes */
return RET_FAIL;
}
- getsect(srcx, srcy, §);
- /*
- * military control necessary to move
- * goodies in occupied territory.
- */
- if (sect.sct_oldown != player->cnum) {
- 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))
- tot_mil += total_mil(&land);
- if ((sect.sct_item[I_MILIT] + tot_mil) * 10 < sect.sct_item[I_CIVIL]) {
- pr("Military control required to move goods.\n");
- return RET_FAIL;
- }
+ if (!getsect(srcx, srcy, §) || !player->owner) {
+ pr("You don't own %s\n", xyas(srcx, srcy, player->cnum));
+ return RET_FAIL;
+ }
+ if (!military_control(§)) {
+ pr("Military control required to move planes.\n");
+ return RET_FAIL;
}
dam = 1;
mcost = move_ground((s_char *)&plane, §, &endsect,