Fix 2111406, 2058865: stacking interacting badly with allies.

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

Created by  haranp  on September 20, 2008
PUSD35NF736YWPQS7FJGSFVTZPP4I6MN5NQRVG4WUC4SKEKOGFKAC
Change contents