diff options
| author | gammafunk <gammafunk@gmail.com> | 2013-09-29 20:00:11 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-10-01 21:27:29 -0400 |
| commit | 242c44385c9b9e660fd9603ada90e7a955d56330 (patch) | |
| tree | a50a1a585df06c76320d44a95336a126cb33ddd4 /crawl-ref/source/misc.h | |
| parent | 5215da038daff4c36708ba59b59847e22a8ea665 (diff) | |
| download | crawl-ref-242c44385c9b9e660fd9603ada90e7a955d56330.tar.gz crawl-ref-242c44385c9b9e660fd9603ada90e7a955d56330.zip | |
Simplify conduct checks and fix prompting with elec/devastator for jump-attack
Instead of trying to differentiate sanctuary vs. other conduct issues, just
count them equally as a conduct violation, which seems the intention of
bad_attack() anyways. Elec attacks for targets in water and devastator also
give conduct prompts now with no double-prompting.
Diffstat (limited to 'crawl-ref/source/misc.h')
| -rw-r--r-- | crawl-ref/source/misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h index cdab1298d5..c83f647908 100644 --- a/crawl-ref/source/misc.h +++ b/crawl-ref/source/misc.h @@ -124,7 +124,8 @@ bool stop_attack_prompt(const monster* mon, bool beam_attack, bool check_landing_only = false); bool stop_attack_prompt(targetter &hitfunc, string verb, - bool (*affects)(const actor *victim) = 0); + bool (*affects)(const actor *victim) = 0, + bool *prompted = nullptr); bool is_dragonkind(const actor *act); |