Apply Josh's patch to fix a shadowed variable, and also add whitespace

fixes.

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

Created by  dolorous  on March 26, 2008
V77IIRDTMZWKFEZEQIQNBMVELSSFTPV2ZWR2QIALU5Z7I3YZZBZAC
Change contents