Take monsters' primary and secondary habitats into account when first

placing them, too. This should allow proper creation of merfolk zombies on land, and, hence, should fix [2146792].

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7144 c06c8d41-db1a-0410-9941-cceddc491573

Created by  dolorous  on October 5, 2008
RVGFSBOM6ZKEFVVGROSW454QSLU4J6TSRU4D6EQMXD4CWQ4UN3TQC
Change contents