summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-05 19:42:01 +0300
committerRobert Vollmert <rvollmert@gmx.net>2009-11-05 18:50:57 +0100
commitde162132f702a4723cc9390d8c83baa012844161 (patch)
tree920b26fe8ea60d7d0225d59435f49f7e6e90d3d5 /crawl-ref/source/fight.cc
parentcf225c256f67b33f96a04c243f7c88ba23168664 (diff)
downloadcrawl-ref-de162132f702a4723cc9390d8c83baa012844161.tar.gz
crawl-ref-de162132f702a4723cc9390d8c83baa012844161.zip
Replace uses of player_is_swimming with you.swimming.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 77b954b513..3d88c58563 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -239,7 +239,7 @@ int calc_heavy_armour_penalty( bool random_factor )
// Wearing heavy armour in water is particularly cumbersome.
if (you.species == SP_MERFOLK && grd(you.pos()) == DNGN_DEEP_WATER
- && player_is_swimming())
+ && you.swimming())
{
ev_pen *= 2;
}
@@ -985,7 +985,7 @@ bool melee_attack::player_aux_unarmed()
if ((you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
|| player_genus(GENPC_DRACONIAN)
- || (you.species == SP_MERFOLK && player_is_swimming())
+ || (you.species == SP_MERFOLK && you.swimming())
|| player_mutation_level(MUT_STINGER))
&& one_chance_in(3))
{
@@ -1098,7 +1098,7 @@ bool melee_attack::player_aux_unarmed()
{
// not draconian, and not wet merfolk
if (!player_genus(GENPC_DRACONIAN)
- && !(you.species == SP_MERFOLK && player_is_swimming())
+ && !(you.species == SP_MERFOLK && you.swimming())
&& !player_mutation_level(MUT_STINGER)
|| (!one_chance_in(4)))