summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-01 00:54:21 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-01 00:54:21 +0000
commitbfa7d7269dd46c67dd56e9e402ec252880f884a6 (patch)
tree8e37f37dc3f9daebad17da41a8e3294c25367d2f
parentc1100eb851faa6a5c8ff27955f44f0a4f8e881b4 (diff)
downloadcrawl-ref-bfa7d7269dd46c67dd56e9e402ec252880f884a6.tar.gz
crawl-ref-bfa7d7269dd46c67dd56e9e402ec252880f884a6.zip
Merge r8068 fix to bug #2478713: do previous command again (`) was wasting a
turn during which monsters had an extra chance to react. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@8069 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/acr.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 59df526ad9..0c34f57f08 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1539,6 +1539,12 @@ static void _input()
// the keys to repeat are recorded.
if (cmd == CMD_REPEAT_CMD)
return;
+
+ // If the command was CMD_PREV_CMD_AGAIN then _input() has been
+ // recursively called by _do_prev_cmd_again() via process_command()
+ // to re-do the command, so there's nothing more to do.
+ if (cmd == CMD_PREV_CMD_AGAIN)
+ return;
}
if (need_to_autoinscribe())