Remove option TRADESHIPS, customize table ship-chr instead

Trade ships are now enabled when a ship type with capability trade
exists.  No such type exists by default; to enable trade ships,
deities have to customize table ship-chr.

Before, trade ship types were ignored when option TRADESHIPS was
disabled.  Except for xdump ship-chr, which happily dumped unusable
trade ship types.
This commit is contained in:
Markus Armbruster 2011-05-22 16:49:17 +02:00
parent c4254764bf
commit 352bc320d2
19 changed files with 32 additions and 41 deletions

View file

@ -129,11 +129,8 @@ buil(void)
break;
case 's':
type = ef_elt_byname(EF_SHIP_CHR, p);
if (type >= 0) {
if (type >= 0)
rqtech = mchr[type].m_tech;
if ((mchr[type].m_flags & M_TRADE) && !opt_TRADESHIPS)
type = -1;
}
break;
case 'l':
type = ef_elt_byname(EF_LAND_CHR, p);