diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-23 20:35:26 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-23 20:35:26 +0000 |
| commit | 7ace26d7f10f5eaefbe12f454183c88dbcb09b73 (patch) | |
| tree | 2ebb22fede59d48e68a8fe4ba2fe976eae2f22ac /crawl-ref/source/misc.cc | |
| parent | 5ab24723edffd09f81cbfb6634fa1b175ed9d054 (diff) | |
| download | crawl-ref-7ace26d7f10f5eaefbe12f454183c88dbcb09b73.tar.gz crawl-ref-7ace26d7f10f5eaefbe12f454183c88dbcb09b73.zip | |
Finally remove the code that was preventing the coloured bars from
updating while resting in Tiles. With the overhaul of the drawing
routines (already one or two months old) it's not needed anymore, and I
really should have reacted to the new circumstances sooner. :P
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6088 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 542a912c17..65af62fd85 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1499,10 +1499,6 @@ void up_stairs(dungeon_feature_type force_stair, level_id old_level_id = level_id::current(); LevelInfo &old_level_info = travel_cache.get_level_info(old_level_id); - // Does the next level have a warning annotation? -// if (!force_stair && !check_annotation_exclusion_warning()) -// return; - // Since the overloaded message set turn_is_over, I'm assuming that // the overloaded character makes an attempt... so we're doing this // check before that one. -- bwr @@ -1814,10 +1810,6 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, mpr("You fall through a shaft!"); } - // Does the next level have a warning annotation? -// if (!force_stair && !check_annotation_exclusion_warning()) -// return; - // All checks are done, the player is on the move now. // Fire level-leaving trigger. @@ -1830,7 +1822,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, // reaching the Abyss. if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS) mark_milestone("abyss.enter", "entered the Abyss!"); - else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS) + else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)Picture mark_milestone("abyss.exit", "escaped from the Abyss!"); } #endif |