summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/trap_def.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-27 16:37:34 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-27 16:44:05 +0100
commit2be5d5f08528b99817be0cf6fe8c04bab40842ec (patch)
tree6a5b556620e5a599c6f79f3053c4f927d903a215 /crawl-ref/source/trap_def.h
parentfa0307d3451bef981c807759f956b0de01d5485f (diff)
downloadcrawl-ref-2be5d5f08528b99817be0cf6fe8c04bab40842ec.tar.gz
crawl-ref-2be5d5f08528b99817be0cf6fe8c04bab40842ec.zip
Untie disarm confirmations from autotravel settings (Mantis 254).
Since it is done only on an explicit request, copious safety margins are not needed. I didn't provide an alternate way to disable the confirmation, but since the danger is now always real, I don't think that's needed.
Diffstat (limited to 'crawl-ref/source/trap_def.h')
-rw-r--r--crawl-ref/source/trap_def.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/trap_def.h b/crawl-ref/source/trap_def.h
index 90c2cc4372..2ec924d3b4 100644
--- a/crawl-ref/source/trap_def.h
+++ b/crawl-ref/source/trap_def.h
@@ -18,6 +18,7 @@ struct trap_def
void prepare_ammo();
bool type_has_ammo() const;
bool active() const;
+ int max_damage(const actor& act);
private:
void message_trap_entry();