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/message.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/message.cc')
-rw-r--r-- | crawl-ref/source/message.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index d0ada6d8d2..a4e7d886ce 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -564,12 +564,6 @@ public: */ void more(bool full, bool user=false) { - if (crawl_state.loading_level) - { - crawl_state.delayed_more = true; - return; - } - if (_pre_more()) return; @@ -1566,15 +1560,6 @@ void more(bool user_forced) mesclr(); } -void pop_delayed_more() -{ - if (!crawl_state.delayed_more) - return; - ASSERT(!crawl_state.loading_level); - crawl_state.delayed_more = false; - more(); -} - static bool is_channel_dumpworthy(msg_channel_type channel) { return channel != MSGCH_EQUIPMENT |