Move spell targeting before miscast check. Not everything is moved - spells

with weird targeting (like Conjure Flame) still target after the miscast check.

Tweaked targeting prompt slightly.

Don't dock turn for zapping non-wand.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1039 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/spells1.h b/crawl-ref/source/spells1.h
index 64481d53bb..1f684139c4 100644
--- a/crawl-ref/source/spells1.h
+++ b/crawl-ref/source/spells1.h
@@ -69,19 +69,19 @@ int blink(void);
 /* ***********************************************************************
  * called from: spell
  * *********************************************************************** */
-int cast_big_c(int pow, char cty);
+int cast_big_c(int pow, char cty, bolt &beam);
 void cast_confusing_touch(int power);
 void cast_cure_poison(int mabil);
 int  allowed_deaths_door_hp(void);
 void cast_deaths_door(int pow);
-int cast_fire_storm(int powc);
+int cast_fire_storm(int powc, bolt &beam);
 bool cast_revivification(int power);
 void cast_berserk(void);
 void cast_ring_of_flames(int power);
 int conjure_flame(int pow);
 void extension(int pow);
-int fireball(int power);
-int stinking_cloud(int pow);
+int fireball(int power, bolt &beam);
+int stinking_cloud(int pow, bolt &beam);
 void abjuration(int pow);
 
 // last updated 24may2000 {dlb}