Report parent level in branch entry milestones.

When generating a milestone for entering a new area, include the level
containing the entry stair/portal in the 'oplace' key. This will allow Henzell
to report the dungeon level containing the Lair entrance, wizlab, etc.

This isn't perfect: oplace will be plain Wrong when the player uses the Trowel
card to create portal vaults outside the main dungeon (such as Trowel in
Pandemonium). Trowel is generally problematic outside the dungeon
(see http://crawl.develz.org/mantis/view.php?id=960).

Since Ziggurats can legitimately be generated in Pandemonium, generate ziggurat
entry milestones in the onclimb event of the ziggurat portal, instead of
waiting until the player has entered the Ziggurat. Unfortunately this means
that the entry place for Ziggurats will be reported in the 'place' field
instead of 'oplace'.

I recommend that this change not be included in 0.6, since we need additional
work to fix Trowel and other issues before we have full milestone sanity.

1 files changed, 2 insertions, 0 deletions

diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index b56d0cb0ee..f4146a10ac 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -64,6 +64,8 @@ Branch& your_branch();
 
 bool at_branch_bottom();
 bool is_hell_subbranch(branch_type branch);
+level_id branch_entry_level(branch_type branch);
+level_id current_level_parent();
 
 branch_type str_to_branch(const std::string &branch,
                           branch_type err = NUM_BRANCHES);