From b871ff5c1c4ae1e0fd4e27a84ca7dbcdc2eec539 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 14 Mar 2007 18:56:47 +0000
Subject: 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
---
 crawl-ref/source/spells3.cc | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'crawl-ref/source/spells3.cc')

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 77aa6e33c5..7427ea6955 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -230,23 +230,12 @@ int cast_smiting(int power)
     return (success);
 }                               // end cast_smiting()
 
-int airstrike(int power)
+int airstrike(int power, dist &beam)
 {
     bool success = false;
-    struct dist beam;
     struct monsters *monster = 0;       // NULL {dlb}
     int hurted = 0;
 
-    mpr("Strike whom?", MSGCH_PROMPT);
-
-    direction( beam, DIR_TARGET, TARG_ENEMY );
-
-    if (!beam.isValid)
-    {
-        canned_msg(MSG_OK);
-        return (-1);
-    }
-
     if (mgrd[beam.tx][beam.ty] == NON_MONSTER
         || beam.isMe)
     {
-- 
cgit v1.2.3-54-g00ecf