diff options
author | Adam Borowski <kilobyte@angband.pl> | 2013-12-03 13:18:31 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2013-12-03 13:18:31 +0100 |
commit | 8c39b8ecec30c732b1992bc5dda37c18452aafce (patch) | |
tree | 0ff32fa2c8d4fd57575b83dfe7cb237f95d2118e /crawl-ref/source/files.cc | |
parent | a7eb7c73565d0573719b88fd5586e16e356677fb (diff) | |
download | crawl-ref-8c39b8ecec30c732b1992bc5dda37c18452aafce.tar.gz crawl-ref-8c39b8ecec30c732b1992bc5dda37c18452aafce.zip |
Revert "Delay more prompt until level has finished loading."
While the problem this commit attempts to fix is real, I'm afraid it causes
more breakage:
* it removes debug messages from map generation
* especially, infinite loops become extremely hard to debug
* loses output that overflows
* has issues with force_more
* portal vault announcements are lost
For example, a level with both a Lab and an Ice Cave shows just:
"There is an entrance to an ice cave on this level. Hurry and find it before the portal melts!"
even though there's no overflow. The rest (the main "wave of frost" message
and anything about the Lab) are gone.
I'm afraid some other approach is needed. Perhaps forcing a screen draw?
This reverts commit 8471a022e76bae39918ba6eaa1fbbab5c7ceb64f.
Diffstat (limited to 'crawl-ref/source/files.cc')
-rw-r--r-- | crawl-ref/source/files.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index e98a4e5fc1..227b7b4e36 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -1183,8 +1183,6 @@ static void _do_lost_items() bool load_level(dungeon_feature_type stair_taken, load_mode_type load_mode, const level_id& old_level) { - unwind_bool levelgen(crawl_state.loading_level, true); - // Did we get here by popping the level stack? bool popped = false; @@ -1468,10 +1466,10 @@ bool load_level(dungeon_feature_type stair_taken, load_mode_type load_mode, you.time_taken = div_rand_round(you.time_taken * 2, 3); dprf("arrival time: %d", you.time_taken); - } - if (just_created_level) - run_map_epilogues(); + if (just_created_level) + run_map_epilogues(); + } // Save the created/updated level out to disk: if (make_changes) |