Use branch depth rather than absolute depth as the authoritative one.

1 files changed, 2 insertions, 7 deletions

diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index 99dea92117..7cac78d88b 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -19,21 +19,16 @@ const Branch& your_branch()
 
 bool at_branch_bottom()
 {
-    return brdepth[you.where_are_you] == player_branch_depth();
+    return brdepth[you.where_are_you] == you.depth;
 }
 
 level_id branch_entry_level(branch_type branch)
 {
     // Hell and its subbranches need obnoxious special-casing:
     if (branch == BRANCH_VESTIBULE_OF_HELL)
-    {
-        return level_id(you.hell_branch,
-                        subdungeon_depth(you.hell_branch, you.hell_exit));
-    }
+        return level_id(you.hell_branch, you.hell_exit);
     else if (is_hell_subbranch(branch))
-    {
         return level_id(BRANCH_VESTIBULE_OF_HELL, 1);
-    }
 
     const branch_type parent = branches[branch].parent_branch;
     const int subdepth = startdepth[branch];