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

Fix when scuttle_tradeship() asks for confirmation

Browse source 
Fix scuttle to ask for confirmation when scuttling a tradeship in an
unsuitable sector even when the tradeship is pirated.  Broken when
commit a99bc3be (v4.2.13) suppressed that for pirated tradeships
wholesale because it let pirates ferret out where the ship was built.
This commit is contained in:
Markus Armbruster 2008-09-13 17:07:15 -04:00
parent 96796dc756
commit 693c1a64c3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
{
float cash = 0;
float ally_cash = 0;
int dist;
int dist = -1;
struct sctstr sect;
struct mchrstr *mp;
struct natstr *np;
@ -202,7 +202,7 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
wu(0, sp->shp_own, "Unfortunately, you make $0 on this trade.\n");
} else if (cash && interactive) {
player->dolcost -= cash;
} else if (interactive && sp->shp_own == sp->shp_orig_own) {
} else if (interactive && (dist < 0 || sp->shp_own == sp->shp_orig_own)) {
pr("You won't get any money if you scuttle in %s!",
xyas(sp->shp_x, sp->shp_y, player->cnum));
sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));