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, 1 deletions

diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index f81ca07ba5..6afb307431 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -25,6 +25,7 @@ struct playerspell
   unsigned int disciplines; // bitfield
   unsigned int flags;       // bitfield
   unsigned int level;
+  const char *target_prompt;
 };
 
 
@@ -46,6 +47,7 @@ int spell_mana(int which_spell);
 // * called from: chardump - it_use3 - player - spell - spl-book -
 // *              spells0 - spells3
 int spell_difficulty(int which_spell);
+const char *get_spell_target_prompt( int which_spell );
 
 int spell_levels_required(int which_spell);
 
@@ -83,7 +85,8 @@ int apply_area_within_radius(int (*func) (int, int, int, int),
 
 char spell_direction( struct dist &spelld, struct bolt &pbolt,
                       targeting_type restrict = DIR_NONE,
-                      int mode = TARG_ENEMY );
+                      int mode = TARG_ENEMY,
+                      const char *prompt = NULL );
 
 void apply_area_cloud(int (*func) (int, int, int, int), int x, int y,
                       int pow, int number, int ctype);