From 9540dc0c39636e9baef2b3e04199aea0fcd3da52 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Tue, 26 Jun 2007 06:38:49 +0000 Subject: [1743293] Fixed merfolk not getting free travel through water. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1657 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/travel.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 16632d34c0..74a30dd9a2 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -475,8 +475,9 @@ static void init_terrain_check() // Permanently levitating players can cross most hostile terrain. signed char trav = player_is_permalevitating()? TRAVERSABLE : IMPASSABLE; - - set_pass_feature(DNGN_DEEP_WATER, trav); + + if (water != TRAVERSABLE) + set_pass_feature(DNGN_DEEP_WATER, trav); set_pass_feature(DNGN_LAVA, trav); set_pass_feature(DNGN_TRAP_MECHANICAL, trav); } -- cgit v1.2.3-54-g00ecf