diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-20 21:15:31 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-20 21:15:31 +0000 |
| commit | 6fc5961d648d5a69b2fc848d1e93ea122ca56f2d (patch) | |
| tree | 97d7df5c0d7e0b4f3ea7eeea7c4c37d07de38c89 /crawl-ref/source/travel.cc | |
| parent | 9b5ee487ebe26e03f3b1d70520492f5d0bf54de0 (diff) | |
| download | crawl-ref-6fc5961d648d5a69b2fc848d1e93ea122ca56f2d.tar.gz crawl-ref-6fc5961d648d5a69b2fc848d1e93ea122ca56f2d.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6009 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/travel.cc')
| -rw-r--r-- | crawl-ref/source/travel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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) |