summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/branch.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@wybt.net>2011-06-19 14:42:54 +0400
committerVsevolod Kozlov <zaba@wybt.net>2011-06-19 14:44:40 +0400
commitd692c071c9902c460d5ca0c52b7f64f52d772edd (patch)
treeb005c47cfa059b1b6103d2c57edb8ef47d3527ff /crawl-ref/source/branch.cc
parent8efb8be36aaeafb39981c6ef4205320ed850c948 (diff)
downloadcrawl-ref-d692c071c9902c460d5ca0c52b7f64f52d772edd.tar.gz
crawl-ref-d692c071c9902c460d5ca0c52b7f64f52d772edd.zip
Check for level_type == LEVEL_DUNGEON in at_branch_bottom.
Anything relying on it -not- checking level_type is probably obscure and should be done in a different way. Not sure whether such cases exist. Should fix #415[23].
Diffstat (limited to 'crawl-ref/source/branch.cc')
-rw-r--r--crawl-ref/source/branch.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index 2f08704dec..a351a6ae9f 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -15,7 +15,8 @@ Branch& your_branch()
bool at_branch_bottom()
{
- return your_branch().depth == player_branch_depth();
+ return your_branch().depth == player_branch_depth()
+ && you.level_type == LEVEL_DUNGEON;
}
level_id branch_entry_level(branch_type branch)