Fix 1996837: Allow equipping spellcasters with ammunition on generation.

Fix 1997179: Merge zombies correctly in the monster list.

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

Created by  j-p-e-g  on June 19, 2008
HAM54HXIO2245W6REO4RZDY2QMIH476AWWJSMYAMSYYNEBBJSHWAC
Dependencies
In channels
main
Change contents