diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-04 10:41:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-04 10:41:46 +0000 |
| commit | 746b402561b6b27625c5c1ac33028da9aa846b18 (patch) | |
| tree | 98f575a915c3403deeeb51fc5f4c11d4896124f0 /crawl-ref/source/misc.cc | |
| parent | b330585db366bb8a0ac70c3a73a1e1afd26e4a98 (diff) | |
| download | crawl-ref-746b402561b6b27625c5c1ac33028da9aa846b18.tar.gz crawl-ref-746b402561b6b27625c5c1ac33028da9aa846b18.zip | |
More general stuff.
- Beogh's water walk ability != swimming
- monsters won't throw nets at you if you're already caught
- Moved a few more messages into MSGCH_EXAMINE_FILTER.
- Added information on new options.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2051 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index d4212f73aa..ac8efb3947 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2128,6 +2128,10 @@ bool fall_into_a_pool( int entry_x, int entry_y, bool allow_shift, merfolk_start_swimming(); return (false); } + + // sanity check + if (terrain != DNGN_LAVA && beogh_water_walk()) + return (false); mprf("You fall into the %s!", (terrain == DNGN_LAVA) ? "lava" : |