From 6fc5961d648d5a69b2fc848d1e93ea122ca56f2d Mon Sep 17 00:00:00 2001 From: dolorous Date: Fri, 20 Jun 2008 21:15:31 +0000 Subject: Simplify. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6009 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/travel.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/travel.cc') diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 074d2e8b1c..7930c85352 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -3746,11 +3746,11 @@ const runrest &runrest::operator = (int newrunmode) static dungeon_feature_type _base_grid_type( dungeon_feature_type grid ) { // Don't stop for undiscovered traps: - if (grid == DNGN_UNDISCOVERED_TRAP) - return (DNGN_FLOOR); - - if (grid == DNGN_FLOOR_SPECIAL) + if ((grid >= DNGN_FLOOR_MIN && grid <= DNGN_FLOOR_MAX) + || grid == DNGN_UNDISCOVERED_TRAP) + { return (DNGN_FLOOR); + } // Merge walls and secret doors. if (grid_is_wall(grid) || grid == DNGN_SECRET_DOOR) -- cgit v1.2.3-54-g00ecf