And name the consolidated function properly.

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

Created by  dolorous  on May 25, 2008
NM6UK4SZ3JWD3WWDY355C5NW2MBIFR4N73QHF43AE4CKR5LOLRCQC
Change contents