diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-25 12:36:43 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-25 12:36:43 +0000 |
| commit | 552a18061460342af014e69c7cee26bb5bf358ef (patch) | |
| tree | 6a715c1f8acde3dda56bf5c2e8cd7f4a3aee6c2c /crawl-ref/source/spells1.cc | |
| parent | ebb6673550564e06b257690b5fa0100af8786838 (diff) | |
| download | crawl-ref-552a18061460342af014e69c7cee26bb5bf358ef.tar.gz crawl-ref-552a18061460342af014e69c7cee26bb5bf358ef.zip | |
* Add support for packaging save files with tar. (Patch by Trent W. Buck.)
* Fix random blink placing the player in dangerous clouds.
* Fix message when trying to place Conjure Flame in a wax wall.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10397 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index c0cb9fe8aa..8e74d8f7e6 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -498,7 +498,7 @@ void identify(int power, int item_slot) // Returns whether the spell was actually cast. bool conjure_flame(int pow, const coord_def& where) { - // FIXME: this would be better handled by a flag to enforce max range. + // FIXME: This would be better handled by a flag to enforce max range. if (grid_distance(where, you.pos()) > spell_range(SPELL_CONJURE_FLAME, pow, true) || !in_bounds(where)) @@ -515,7 +515,10 @@ bool conjure_flame(int pow, const coord_def& where) if (grid_is_solid(where)) { - mpr("You can't ignite solid rock!"); + if (grd(where) == DNGN_WAX_WALL) + mpr("The flames aren't hot enough to melt wax walls!"); + else + mpr("You can't ignite solid rock!"); return (false); } |