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.
{
float cash = 0;
float ally_cash = 0;
- int dist;
+ int dist = -1;
struct sctstr sect;
struct mchrstr *mp;
struct natstr *np;
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));