diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-04 11:13:12 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-04 11:13:12 +0000 |
| commit | 749f3027897c524569cd01cf0e7de7d5dceddeeb (patch) | |
| tree | 9b041cf37277399a1ad5e389237b0cb6f5de2f35 | |
| parent | c81fce9280be5aa5fdfb47bc4df74f4984150dda (diff) | |
| download | crawl-ref-749f3027897c524569cd01cf0e7de7d5dceddeeb.tar.gz crawl-ref-749f3027897c524569cd01cf0e7de7d5dceddeeb.zip | |
Merge trunk 1530 (clouds override submerged monster ripples) into 0.2 branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1531 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index b05018f745..ee0df7a891 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -3354,7 +3354,9 @@ static void monster_regenerate(monsters *monster) || (monster->type == MONS_FIRE_ELEMENTAL && (grd[monster->x][monster->y] == DNGN_LAVA - || env.cgrid[monster->x][monster->y] == CLOUD_FIRE)) + || (env.cgrid(monster->pos()) != EMPTY_CLOUD + && env.cloud[env.cgrid(monster->pos())].type + == CLOUD_FIRE))) || (monster->type == MONS_WATER_ELEMENTAL && (grd[monster->x][monster->y] == DNGN_SHALLOW_WATER diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 537b44f976..21280ca7b4 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -655,7 +655,8 @@ void monster_grid(bool do_updates) { // ripple effect? if (grd[monster->x][monster->y] == DNGN_SHALLOW_WATER - && !mons_flies(monster)) + && !mons_flies(monster) + && env.cgrid(monster->pos()) == EMPTY_CLOUD) { set_show_backup(ex, ey); env.show[ex][ey] = DNGN_INVIS_EXPOSED; |