diff options
author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-08 21:25:26 +0300 |
---|---|---|
committer | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-08 21:25:49 +0300 |
commit | 3ba101e847eae30dd5abf9661b252e6e5ebf87ff (patch) | |
tree | ce4a7d129650d9eaaeff7a58c091595bca5c3780 | |
parent | 4fd3b662d0fd279d30b28c88bea407f213eb5534 (diff) | |
download | crawl-ref-3ba101e847eae30dd5abf9661b252e6e5ebf87ff.tar.gz crawl-ref-3ba101e847eae30dd5abf9661b252e6e5ebf87ff.zip |
Replace uses of player_can_swim with player::can_swim.
-rw-r--r-- | crawl-ref/source/player.cc | 9 | ||||
-rw-r--r-- | crawl-ref/source/player.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index bdabea3756..5ed601881c 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -383,11 +383,6 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift, return (true); } -bool player_can_swim() -{ - return (you.can_swim()); -} - bool is_feat_dangerous(dungeon_feature_type grid) { return (!you.airborne() @@ -421,7 +416,7 @@ bool player_in_hell(void) bool player_likes_water(bool permanently) { - return (player_can_swim() || (!permanently && beogh_water_walk())); + return (you.can_swim() || (!permanently && beogh_water_walk())); } bool player_in_bat_form() @@ -3206,7 +3201,7 @@ int check_stealth(void) // Merfolk can sneak up on monsters underwater -- bwr if (you.species == SP_MERFOLK) stealth += 50; - else if ( !player_can_swim() && !you.extra_balanced() ) + else if ( !you.can_swim() && !you.extra_balanced() ) stealth /= 2; // splashy-splashy } else if (player_mutation_level(MUT_HOOVES)) diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index b6dd64644b..f5e12a5ed5 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -610,7 +610,6 @@ int player_spirit_shield(bool calc_unid = true); bool player_can_smell(); bool player_likes_chunks(bool permanently = false); -bool player_can_swim(); bool player_likes_water(bool permanently = false); int player_mutation_level(mutation_type mut); |