Apply zelgadis' fix from r5625 to three other places that need it.

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

Created by  dolorous  on June 8, 2008
5FJOO7TPXXTY66X4O242AWSMYNDLG2NI2NKSHDELLDIMAOE5OBTAC
Change contents