diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-05 15:22:45 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-05 15:22:45 +0000 |
| commit | 16af0422e54e97a9f6ca2f275ed51c19775b7b80 (patch) | |
| tree | f79a02b6c9c260028df0bd894511f965c51e0b01 /crawl-ref/source/player.cc | |
| parent | 376d7d8be0443ac004a1fe5d88f56325497d1921 (diff) | |
| download | crawl-ref-16af0422e54e97a9f6ca2f275ed51c19775b7b80.tar.gz crawl-ref-16af0422e54e97a9f6ca2f275ed51c19775b7b80.zip | |
Travel will now avoid deep water unless you're permanently safe in it.
Failing to displace a monster triggers an interrupt.
Fixed up autoinscription a bit more.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3004 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 65917af34b..917f95518c 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -352,9 +352,9 @@ bool player_in_water(void) return (you.in_water()); } -bool player_likes_water(void) +bool player_likes_water(bool permanently) { - return (player_can_swim() || beogh_water_walk()); + return (player_can_swim() || (!permanently && beogh_water_walk())); } bool player_is_swimming(void) |