diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-15 01:46:47 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-15 01:46:47 +0000 |
| commit | 6feef3bd8bdc3893f50976ee5af0c332e955bdc7 (patch) | |
| tree | 1ace880ed169fad44263f3ec62598f3e72ba0338 /crawl-ref/source/message.cc | |
| parent | 2ed4f389c28fa47ae5e16d747d0eb81e3a498acf (diff) | |
| download | crawl-ref-6feef3bd8bdc3893f50976ee5af0c332e955bdc7.tar.gz crawl-ref-6feef3bd8bdc3893f50976ee5af0c332e955bdc7.zip | |
Disallowing mouse clicks on force_more messages to help avoid accidental deaths.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8451 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/message.cc')
| -rw-r--r-- | crawl-ref/source/message.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 24c014dfae..aedfa7ba65 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -756,7 +756,7 @@ static void base_mpr(const char *inf, msg_channel_type channel, int param, { if (Options.force_more_message[i].is_filtered( channel, imsg )) { - more(); + more(true); New_Message_Count = 0; // One more() is quite enough, thank you! break; @@ -884,7 +884,7 @@ void formatted_message_history(const std::string &st_nocolor, { if (Options.force_more_message[f].is_filtered(channel, st_nocolor)) { - more(); + more(true); New_Message_Count = 0; // One more() is quite enough, thank you! break; @@ -928,7 +928,7 @@ void reset_more_autoclear() autoclear_more = false; } -void more(void) +void more(bool user_forced) { #ifdef DEBUG_DIAGNOSTICS if (you.running) @@ -976,7 +976,8 @@ void more(void) } while (keypress != ' ' && keypress != '\r' && keypress != '\n' && keypress != ESCAPE && keypress != -1 - && keypress != CK_MOUSE_CLICK); + && (user_forced || keypress != CK_MOUSE_CLICK)); + if (keypress == ESCAPE) autoclear_more = true; } |