summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-17 18:57:41 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-17 18:57:41 +0000
commita3376d9f0045cecc075ea0e4e4a60e2c462d5fc4 (patch)
treeba7d883dd82aeb8ef620b71dcff3bc0dfb2576c3
parent6f8e02bb67c56908d9dbaf3edb285a21bbe896b5 (diff)
downloadcrawl-ref-a3376d9f0045cecc075ea0e4e4a60e2c462d5fc4.tar.gz
crawl-ref-a3376d9f0045cecc075ea0e4e4a60e2c462d5fc4.zip
Trunk->0.3 merge (2865): Fixed shadow creatures bugginess when ascending with the Orb.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2866 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monplace.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index cd2cdba876..1a8b0c8044 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -1467,7 +1467,7 @@ int mons_place( int mon_type, beh_type behaviour, int target, bool summoned,
// this gives a slight challenge to the player as they ascend the
// dungeon with the Orb
if (you.char_direction == GDT_ASCENDING && mon_type == RANDOM_MONSTER
- && you.level_type == LEVEL_DUNGEON)
+ && you.level_type == LEVEL_DUNGEON && !summoned)
{
mon_type = pick_zot_exit_defender();
permit_bands = true;