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

@ -83,8 +83,6 @@ make_mchr_index(struct chr_index chridx[], int tlev)
continue;
if (mchr[i].m_tech > tlev)
continue;
if ((mchr[i].m_flags & M_TRADE) && !opt_TRADESHIPS)
continue;
chridx[n].type = i;
chridx[n].tech = mchr[i].m_tech;
n++;