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

Require friendly relations for trade ship to pay off

Browse source
This commit is contained in:
Markus Armbruster 2008-09-13 18:05:58 -04:00
parent faca0eeac5
commit 3318e4e4e5
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/scut.c
View file

@ -165,7 +165,8 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
mp = &mchr[(int)sp->shp_type];
getsect(sp->shp_x, sp->shp_y, &sect);
if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2) {
if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2
&& getrel(getnatp(sect.sct_own), sp->shp_own) >= FRIENDLY) {
dist = mapdist(sp->shp_x, sp->shp_y,
sp->shp_orig_x, sp->shp_orig_y);
/* Don't disclose distance to to pirates */