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

(arm): Fix trading block message.

Browse source 
(disarm): Recipient must be allied.
This commit is contained in:
Markus Armbruster 2006-06-18 17:47:26 +00:00
parent 9837bf0a40
commit 36fbf37bb8
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/commands/arm.c
View file

@ -73,7 +73,7 @@ arm(void)
} }
if (opt_MARKET) { if (opt_MARKET) {
if (ontradingblock(EF_PLANE, &pl)) { if (ontradingblock(EF_PLANE, &pl)) {
pr("You cannot disarm %s while it is on the trading block!\n", pr("You cannot arm %s while it is on the trading block!\n",
prplane(&pl)); prplane(&pl));
return RET_FAIL; return RET_FAIL;
} }
@ -154,6 +154,12 @@ disarm(void)
continue; continue;
} }
getsect(nuke.nuk_x, nuke.nuk_y, &sect); getsect(nuke.nuk_x, nuke.nuk_y, &sect);
if (!player->owner
&& getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
pr("Disarming %s in sector %s requires an alliance!\n",
prplane(&pl), xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
snprintf(buf, sizeof(buf), "unloaded in your %s at %s", snprintf(buf, sizeof(buf), "unloaded in your %s at %s",
dchr[sect.sct_type].d_name, dchr[sect.sct_type].d_name,
xyas(sect.sct_x, sect.sct_y, sect.sct_own)); xyas(sect.sct_x, sect.sct_y, sect.sct_own));