From 5c355726c38b52961de7ad53b837f461a801b6a5 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 25 May 2008 18:33:50 +0000 Subject: 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 --- crawl-ref/source/spells3.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/spells3.cc') diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index dd11b43503..110d24ee74 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -208,10 +208,12 @@ int cast_smiting(int power, dist &beam) god_conduct_trigger conduct; conduct.enabled = false; - success = !stop_attack_prompt(monster, false, false, &conduct); + success = !stop_attack_prompt(monster, false, false); if (success) { + set_attack_conduct(monster, conduct); + mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str()); behaviour_event(monster, ME_ANNOY, MHITYOU); @@ -249,10 +251,12 @@ int airstrike(int power, dist &beam) god_conduct_trigger conduct; conduct.enabled = false; - success = !stop_attack_prompt(monster, false, false, &conduct); + success = !stop_attack_prompt(monster, false, false); if (success) { + set_attack_conduct(monster, conduct); + mprf("The air twists around and strikes %s!", monster->name(DESC_NOCAP_THE).c_str()); -- cgit v1.2.3-54-g00ecf