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

Fix scuttle_it()'s "is a trade ship" sanity check

Browse source 
Only trade ships can be auto-scuttled.  orde() rejects scuttle orders
for other ships.  scuttle_it() double-checks, but gets the test wrong:
it rejects only when opt_TRADESHIPS is enabled.  Fix that.  While
there, make it oops on inadmissible ships.
This commit is contained in:
Markus Armbruster 2011-05-22 12:40:07 +02:00
parent 7457573a50
commit c4254764bf
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/update/nav_ship.c
View file

@ -53,12 +53,9 @@ scuttle_it(struct shpstr *sp)
sp->shp_x, sp->shp_y, sp->shp_uid); sp->shp_x, sp->shp_y, sp->shp_uid);
return; return;
} }
if (opt_TRADESHIPS) { if (CANT_HAPPEN(!opt_TRADESHIPS
if (!(mchr[(int)sp->shp_type].m_flags & M_TRADE)) { || !(mchr[sp->shp_type].m_flags & M_TRADE)))
wu(0, sp->shp_own, "You can only autoscuttle trade ships!\n");
return; return;
}
}
if (!scuttle_tradeship(sp, 0)) { if (!scuttle_tradeship(sp, 0)) {
wu(0, sp->shp_own, wu(0, sp->shp_own,
"%s doesn't pay here! Not scuttled.\n", prship(sp)); "%s doesn't pay here! Not scuttled.\n", prship(sp));