summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 23:12:24 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-28 23:12:24 +0000
commit268bc2a45c52e1940e0efd361bcf8014c8288198 (patch)
tree618e242485e6fa1c7ae13b6c1eb079615b63f281 /crawl-ref/source
parentf817a160c3a2347f30318280346e812ad1a6ede1 (diff)
downloadcrawl-ref-268bc2a45c52e1940e0efd361bcf8014c8288198.tar.gz
crawl-ref-268bc2a45c52e1940e0efd361bcf8014c8288198.zip
Forward-port 0.5 r10458 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10460 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/dat/database/FAQ.txt2
-rw-r--r--crawl-ref/source/spl-cast.cc5
2 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt
index 14d1fd149b..c94be5a020 100644
--- a/crawl-ref/source/dat/database/FAQ.txt
+++ b/crawl-ref/source/dat/database/FAQ.txt
@@ -131,6 +131,7 @@ type you are already highly skilled with to another one that you have no
skill in is a waste of time. The brands may greatly differ in damage output
but you can get a good idea by bashing a few comparatively harmless
monsters with each and comparing the results.
+
Of the enchantments, the second value (damage) is usually more important
than the first (accuracy) unless you hardly ever manage to hit with a
weapon.
@@ -384,6 +385,7 @@ the next version) online on http://crawl.develz.org, or you can download
Windows binaries from the same site. Note that trunk may be buggy, and that
many changes will invalidate your saved games. If that doesn't bother you,
go ahead and play!
+
Be sure to leave some feedback/suggestions/bug reports on the SourceForge
trackers. When doing so please mention the version (r?????) you're
currently playing in case the bug's already been fixed or the feature
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index d20fc01ee7..0d6b7ed2b1 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -197,11 +197,16 @@ static bool _spell_no_hostile_in_range(spell_type spell, int minRange)
case SPELL_PROJECTED_NOISE:
case SPELL_CONJURE_FLAME:
case SPELL_DIG:
+
+ // Airstrike has LOS_RANGE and can go through glass walls.
+ case SPELL_AIRSTRIKE:
+
// These bounce and may be aimed elsewhere to bounce at monsters
// outside range (I guess).
case SPELL_SHOCK:
case SPELL_LIGHTNING_BOLT:
return (false);
+
case SPELL_EVAPORATE:
case SPELL_MEPHITIC_CLOUD:
case SPELL_FIREBALL: