diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-14 18:56:47 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-14 18:56:47 +0000 |
| commit | b871ff5c1c4ae1e0fd4e27a84ca7dbcdc2eec539 (patch) | |
| tree | 97bccbbd3bee3a135205df6a507cfcf4bd6c3d59 /crawl-ref/source/spells3.cc | |
| parent | 0282f209e8d708396f20c99e8b212cfa488aca37 (diff) | |
| download | crawl-ref-b871ff5c1c4ae1e0fd4e27a84ca7dbcdc2eec539.tar.gz crawl-ref-b871ff5c1c4ae1e0fd4e27a84ca7dbcdc2eec539.zip | |
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
Diffstat (limited to 'crawl-ref/source/spells3.cc')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 13 |
1 files changed, 1 insertions, 12 deletions
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) { |