diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 00:05:12 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 00:05:12 +0000 |
| commit | aaaab1c54cca4aecce189e984eb95b0f3232e980 (patch) | |
| tree | 56862bbcce701aa307388c21423995d48d3b0441 /crawl-ref/source/beam.cc | |
| parent | 2259ae9b5e0e95180e07d2aefe0fcc3cdbad33a1 (diff) | |
| download | crawl-ref-aaaab1c54cca4aecce189e984eb95b0f3232e980.tar.gz crawl-ref-aaaab1c54cca4aecce189e984eb95b0f3232e980.zip | |
Bug 1987918: make hellfire and magma produce steam when over water.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5617 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index a05b8dc9b6..d886ec06c9 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3343,7 +3343,7 @@ static int _affect_place_clouds(bolt &beam, int x, int y) // FIRE/COLD over water/lava if (grd[x][y] == DNGN_LAVA && beam.flavour == BEAM_COLD - || grid_is_watery(grd[x][y]) && beam.flavour == BEAM_FIRE) + || grid_is_watery(grd[x][y]) && _is_fiery(beam)) { place_cloud( CLOUD_STEAM, x, y, 2 + random2(5), _whose_kill(beam) ); } @@ -3376,9 +3376,8 @@ static void _affect_place_explosion_clouds(bolt &beam, int x, int y) int duration; // first check: FIRE/COLD over water/lava - if ( grd[x][y] == DNGN_LAVA && beam.flavour == BEAM_COLD - || (grd[x][y] == DNGN_DEEP_WATER || grd[x][y] == DNGN_SHALLOW_WATER) - && beam.flavour == BEAM_FIRE ) + if (grd[x][y] == DNGN_LAVA && beam.flavour == BEAM_COLD + || grid_is_watery(grd[x][y]) && _is_fiery(beam)) { place_cloud( CLOUD_STEAM, x, y, 2 + random2(5), _whose_kill(beam) ); return; |