Really fix compilation.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8765 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 84d1a2ec1a..4e8f3355a8 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -1060,7 +1060,7 @@ std::string grid_preposition(dungeon_feature_type grid, bool active,
             else
                 return "inside";
         }
-        else if (!airborne && grid_can_be_drowned_in(grid))
+        else if (!airborne && (grid == DNGN_LAVA || grid == DNGN_DEEP_WATER))
         {
             if (active)
                 return "around";
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index acf9bbfd3e..2408fc75fc 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -117,8 +117,7 @@ static int _bow_offset(const monsters *mon)
 
 static int _tileidx_monster_base(const monsters *mon, bool detected)
 {
-    int grid = grd(mon->pos());
-    bool in_water = grid_is_water(grid);
+    bool in_water = grid_is_water(grd(mon->pos()));
 
     int type = mon->type;
 
@@ -856,6 +855,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_TOENAIL_GOLEM;
     case MONS_ELECTRIC_GOLEM:
         return TILEP_MONS_ELECTRIC_GOLEM;
+
     // statues (also '8')
     case MONS_ICE_STATUE:
         return TILEP_ICE_STATUE;