summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.cc
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-13 19:59:36 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-13 19:59:36 +0100
commit6434f5435b8f6864c6005efc746799293099bc57 (patch)
treec9ed32dbe40cf368658483d96892217d5ce3219c /crawl-ref/source/traps.cc
parent4c86a4c178ac599a17f865b6dcce84d2631eae8f (diff)
downloadcrawl-ref-6434f5435b8f6864c6005efc746799293099bc57.tar.gz
crawl-ref-6434f5435b8f6864c6005efc746799293099bc57.zip
Use the trap_prompt option to decide whether disarming traps prompts you.
Diffstat (limited to 'crawl-ref/source/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 0acb39b808..eebdd09865 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -780,7 +780,8 @@ void disarm_trap(const coord_def& where)
#ifdef CLUA_BINDINGS
// Prompt for any trap for which you might not survive setting it off.
// (See trapwalk.lua)
- if (!clua.callbooleanfn(false, "ch_cross_trap", "s", trap_name(where)))
+ if (Options.trap_prompt
+ && !clua.callbooleanfn(false, "ch_cross_trap", "s", trap_name(where)))
{
std::string prompt = make_stringf(
"Really try disarming that %s?",