summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-07 20:09:26 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-11-07 20:09:26 +0000
commit7eed2debd3591f291c78fc66f1069d7e5896d9f8 (patch)
treee3c616752000716176c466a47714009a92173e86
parent47bfc2bd83b7d1d7415138542f13bfcff53bd3e0 (diff)
downloadcrawl-ref-7eed2debd3591f291c78fc66f1069d7e5896d9f8.tar.gz
crawl-ref-7eed2debd3591f291c78fc66f1069d7e5896d9f8.zip
Merge r2795 (macros in pray())
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2796 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/religion.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 39e460b77c..111ac7aad7 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -48,6 +48,7 @@
#include "itemprop.h"
#include "item_use.h"
#include "items.h"
+#include "macro.h"
#include "makeitem.h"
#include "message.h"
#include "misc.h"
@@ -808,7 +809,7 @@ void pray()
mpr("Stop praying? ('y' ends prayer, 'r' will renew prayer)",
MSGCH_PROMPT);
- const int tmp = getch();
+ const int tmp = getch_with_command_macros();
if ( tmp == 'y' || tmp == 'Y')
{