diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-26 16:02:55 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-26 16:02:55 +0000 |
| commit | 9c94ca75ce486b32945ee29c557dfc4e00f3daf1 (patch) | |
| tree | 91243b59281a9f4191e7b3998e53f546db0abb81 /crawl-ref | |
| parent | e1ea97bd197688a9242bffb24f766d85a88ff678 (diff) | |
| download | crawl-ref-9c94ca75ce486b32945ee29c557dfc4e00f3daf1.tar.gz crawl-ref-9c94ca75ce486b32945ee29c557dfc4e00f3daf1.zip | |
Fixed bug with branch level stairs in Pan.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@889 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/misc.cc | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 46eead5ca3..ecab6a7ea4 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -389,7 +389,8 @@ void builder(int level_number, char level_type) // Top level of branch levels - replaces up stairs // with stairs back to dungeon or wherever: if ( branches[(int)you.where_are_you].exit_stairs != NUM_FEATURES && - player_branch_depth() == 1 ) + player_branch_depth() == 1 && + you.level_type == LEVEL_DUNGEON ) { for (x = 1; x < GXM; x++) for (y = 1; y < GYM; y++) @@ -399,7 +400,8 @@ void builder(int level_number, char level_type) } // bottom level of branch - replaces down stairs with up ladders: - if ( player_branch_depth() == branches[(int)you.where_are_you].depth ) + if ( player_branch_depth() == branches[(int)you.where_are_you].depth && + you.level_type == LEVEL_DUNGEON) { for (x = 1; x < GXM; x++) for (y = 1; y < GYM; y++) @@ -4193,7 +4195,7 @@ static void place_branch_entrances(int dlevel, char level_type) { int sx, sy; - if (!level_type == LEVEL_DUNGEON) + if (level_type != LEVEL_DUNGEON) return; if (player_in_branch( BRANCH_MAIN_DUNGEON )) diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 200f2bd7bd..af5174d97f 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -911,7 +911,7 @@ void down_stairs( bool remove_stairs, int old_level, int force_stair ) if (stair_find == DNGN_EXIT_ABYSS || stair_find == DNGN_EXIT_PANDEMONIUM) { leave_abyss_pan = true; - mpr("You pass through the gate, and find yourself at the top of a staircase."); + mpr("You pass through the gate."); more(); } |