From fd14039a0c691b4b41b524507367664625e96551 Mon Sep 17 00:00:00 2001
From: Shayne Halvorson <N78291@gmail.com>
Date: Sat, 7 May 2011 17:25:08 -0500
Subject: [PATCH] Fix grey draconians receiving penalties in water.

---
 crawl-ref/source/player-act.cc |    4 +++-
 crawl-ref/source/player.cc     |    3 ++-
 crawl-ref/source/view.cc       |    5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index 5ced0d2..c557b90 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -19,6 +19,7 @@
 #include "libutil.h"
 #include "misc.h"
 #include "monster.h"
+#include "species.h"
 #include "state.h"
 #include "terrain.h"
 #include "transform.h"
@@ -110,7 +111,8 @@ bool player::submerged() const
 
 bool player::floundering() const
 {
-    return in_water() && !can_swim() && !extra_balanced();
+    return (in_water() && !can_swim() && !extra_balanced() 
+            && !species_likes_water(you.species));
 }
 
 bool player::extra_balanced() const
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 31d248c..2a55cff 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3619,7 +3619,8 @@ int check_stealth(void)
         // Merfolk can sneak up on monsters underwater -- bwr
         if (you.fishtail)
             stealth += 50;
-        else if (!you.can_swim() && !you.extra_balanced())
+        else if (!you.can_swim() && !you.extra_balanced() 
+                 && !species_likes_water(you.species))
             stealth /= 2;       // splashy-splashy
     }
 
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 6430b76..be785ae 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -54,6 +54,7 @@
 #include "output.h"
 #include "player.h"
 #include "random.h"
+#include "species.h"
 #include "stash.h"
 #include "state.h"
 #include "stuff.h"
@@ -942,11 +943,11 @@ static void _draw_player(screen_cell_t *cell,
     // Player overrides everything in cell.
     cell->glyph  = mons_char(you.symbol);
     cell->colour = mons_class_colour(you.symbol);
-    if (you.swimming())
+    if (you.swimming() || species_likes_water(you.species))
     {
         if (grd(gc) == DNGN_DEEP_WATER)
             cell->colour = BLUE;
-        else
+        else if (grd(gc) == DNGN_SHALLOW_WATER)
             cell->colour = CYAN;
     }
     if (Options.use_fake_player_cursor)
-- 
1.6.5.1