diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 16:13:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 16:13:54 +0000 |
| commit | 9e0e937aa69c91a0b299a8f561564776bf2ab153 (patch) | |
| tree | 518a1d46db4280ac5bfd7dce034f0ebc62a251a4 /crawl-ref/source/misc.cc | |
| parent | 9bec932ccdd73db4bab274c36acf0cb9de818b88 (diff) | |
| download | crawl-ref-9e0e937aa69c91a0b299a8f561564776bf2ab153.tar.gz crawl-ref-9e0e937aa69c91a0b299a8f561564776bf2ab153.zip | |
Fix 1923913: blood spattering into fountains
Fix 1923487: jewelled helmets getting the "jewelled" randart description
Fix 1923471: Suppress the beholding message if only attacking.
Also remove ARM_HELM since it's identical in every way with ARM_HELMET
and only serves to confuse coders.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3858 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index ae050e7acb..c162843083 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -302,6 +302,10 @@ static bool allow_bleeding_on_square(int x, int y) if (grd[x][y] >= DNGN_LAVA && grd[x][y] < DNGN_FLOOR) return (false); + // no spattering into fountains + if (grd[x][y] == DNGN_BLUE_FOUNTAIN || grd[x][y] == DNGN_SPARKLING_FOUNTAIN) + return (false); + // the good gods like to keep their altars pristine if (is_good_god(grid_altar_god(grd[x][y]))) return (false); |