diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-11-25 17:41:56 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-11-25 17:43:49 +0100 |
| commit | e125b207452baa2bd8cd6506fc7e60babf92ae88 (patch) | |
| tree | e4550dac573a468065ef661d6b545cec14eace1f /crawl-ref/source/feature.cc | |
| parent | 35a38c2467191b9dc8afcc52f2bd138b982171d4 (diff) | |
| download | crawl-ref-e125b207452baa2bd8cd6506fc7e60babf92ae88.tar.gz crawl-ref-e125b207452baa2bd8cd6506fc7e60babf92ae88.zip | |
Shorten DNGN_ENTER_FOO/DNGN_RETURN_FROM_FOO enums.
Diffstat (limited to 'crawl-ref/source/feature.cc')
| -rw-r--r-- | crawl-ref/source/feature.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/crawl-ref/source/feature.cc b/crawl-ref/source/feature.cc index 0234245940..aab01d87e8 100644 --- a/crawl-ref/source/feature.cc +++ b/crawl-ref/source/feature.cc @@ -489,21 +489,21 @@ static void _init_feat(feature_def &f, dungeon_feature_type feat) break; #if TAG_MAJOR_VERSION == 34 - case DNGN_ENTER_DWARVEN_HALL: + case DNGN_ENTER_DWARF: #endif - case DNGN_ENTER_ORCISH_MINES: + case DNGN_ENTER_ORC: case DNGN_ENTER_LAIR: - case DNGN_ENTER_SLIME_PITS: + case DNGN_ENTER_SLIME: case DNGN_ENTER_DEPTHS: case DNGN_ENTER_CRYPT: - case DNGN_ENTER_HALL_OF_BLADES: + case DNGN_ENTER_BLADE: case DNGN_ENTER_TEMPLE: - case DNGN_ENTER_SNAKE_PIT: - case DNGN_ENTER_ELVEN_HALLS: + case DNGN_ENTER_SNAKE: + case DNGN_ENTER_ELF: case DNGN_ENTER_TOMB: case DNGN_ENTER_SWAMP: case DNGN_ENTER_SHOALS: - case DNGN_ENTER_SPIDER_NEST: + case DNGN_ENTER_SPIDER: case DNGN_ENTER_FOREST: f.colour = YELLOW; f.dchar = DCHAR_STAIRS_DOWN; @@ -540,21 +540,21 @@ static void _init_feat(feature_def &f, dungeon_feature_type feat) break; #if TAG_MAJOR_VERSION == 34 - case DNGN_RETURN_FROM_DWARVEN_HALL: + case DNGN_RETURN_FROM_DWARF: #endif - case DNGN_RETURN_FROM_ORCISH_MINES: + case DNGN_RETURN_FROM_ORC: case DNGN_RETURN_FROM_LAIR: - case DNGN_RETURN_FROM_SLIME_PITS: + case DNGN_RETURN_FROM_SLIME: case DNGN_RETURN_FROM_VAULTS: case DNGN_RETURN_FROM_CRYPT: - case DNGN_RETURN_FROM_HALL_OF_BLADES: + case DNGN_RETURN_FROM_BLADE: case DNGN_RETURN_FROM_TEMPLE: - case DNGN_RETURN_FROM_SNAKE_PIT: - case DNGN_RETURN_FROM_ELVEN_HALLS: + case DNGN_RETURN_FROM_SNAKE: + case DNGN_RETURN_FROM_ELF: case DNGN_RETURN_FROM_TOMB: case DNGN_RETURN_FROM_SWAMP: case DNGN_RETURN_FROM_SHOALS: - case DNGN_RETURN_FROM_SPIDER_NEST: + case DNGN_RETURN_FROM_SPIDER: case DNGN_RETURN_FROM_FOREST: case DNGN_RETURN_FROM_DEPTHS: f.colour = YELLOW; @@ -771,7 +771,7 @@ static void _init_feat(feature_def &f, dungeon_feature_type feat) break; } - if (feat == DNGN_ENTER_ORCISH_MINES || feat == DNGN_ENTER_SLIME_PITS + if (feat == DNGN_ENTER_ORC || feat == DNGN_ENTER_SLIME || feat == DNGN_ENTER_LABYRINTH) { f.flags |= FFT_EXAMINE_HINT; |