diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-25 18:33:50 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-25 18:33:50 +0000 |
| commit | 5c355726c38b52961de7ad53b837f461a801b6a5 (patch) | |
| tree | af881633db3db2aa4f0fbd23ae66e6d1c0a708c5 /crawl-ref/source/spells2.cc | |
| parent | 35cfeb762010751d217fff7b9e2aa95719ddd899 (diff) | |
| download | crawl-ref-5c355726c38b52961de7ad53b837f461a801b6a5.tar.gz crawl-ref-5c355726c38b52961de7ad53b837f461a801b6a5.zip | |
Consolidate the setting of the "standard" attack conducts.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5238 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 2f322535d9..f2bbe505f2 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1192,10 +1192,12 @@ char burn_freeze(int pow, beam_type flavour) god_conduct_trigger conduct; conduct.enabled = false; - bool success = !stop_attack_prompt(monster, false, false, &conduct); + bool success = !stop_attack_prompt(monster, false, false); if (success) { + set_attack_conduct(monster, conduct); + mprf("You %s %s.", (flavour == BEAM_FIRE) ? "burn" : (flavour == BEAM_COLD) ? "freeze" : |