Flush macro input buffer when fire command fails (Erik).

Allow using the special sequence \{!more} in macros to disable -more- prompts
while processing the macro expansion.

Fixed a couple of off-by-one errors in the level-map.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1557 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 0 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 278be8f1b2..f35db305b5 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -48,6 +48,7 @@
 #include "items.h"
 #include "itemname.h"
 #include "itemprop.h"
+#include "macro.h"
 #include "misc.h"
 #include "monplace.h"
 #include "monstuff.h"
@@ -1218,6 +1219,7 @@ void shoot_thing(void)
     if (you.berserker)
     {
         canned_msg(MSG_TOO_BERSERK);
+        flush_input_buffer( FLUSH_ON_FAILURE );        
         return;
     }
 
@@ -1226,6 +1228,7 @@ void shoot_thing(void)
     if (item == ENDOFPACK)
     {
         mpr("No suitable missiles.");
+        flush_input_buffer( FLUSH_ON_FAILURE );
         return;
     }