diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-19 12:59:48 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-19 12:59:48 +0000 |
| commit | fada7cc9c6c230526a737d34e8f04cf22969b7f7 (patch) | |
| tree | dd7146f60eac45627220860d5ab3289466f9d025 /crawl-ref/source/message.cc | |
| parent | da3bf95551a8e8ccc61035857608f6a1213ccf39 (diff) | |
| download | crawl-ref-fada7cc9c6c230526a737d34e8f04cf22969b7f7.tar.gz crawl-ref-fada7cc9c6c230526a737d34e8f04cf22969b7f7.zip | |
Fix 1996837: Allow equipping spellcasters with ammunition on generation.
Fix 1997179: Merge zombies correctly in the monster list.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5977 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/message.cc')
| -rw-r--r-- | crawl-ref/source/message.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 72a381bafb..dfc4baad0c 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -696,7 +696,7 @@ static void base_mpr(const char *inf, msg_channel_type channel, int param) } mpr_store_messages(imsg, channel, param); -} // end mpr() +} static void mpr_formatted_output(formatted_string fs, int colour) @@ -818,7 +818,7 @@ void mesclr( bool force ) { New_Message_Count = 0; - // if no messages, return. + // If no messages, return. if (!any_messages()) return; @@ -875,7 +875,9 @@ void more(void) #endif do + { keypress = getch(); + } while (keypress != ' ' && keypress != '\r' && keypress != '\n' && keypress != -1); } |