diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-12-19 00:19:24 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-12-19 00:19:24 +0100 |
| commit | f933c8c3d6a141c76ca5e05eda5f11b6d14722c3 (patch) | |
| tree | 80d1922fbb3977ddfdc79678544a5a29f879f894 /crawl-ref/source/files.cc | |
| parent | 56402a27013be84ab7678cbfc1725d380fdaf04e (diff) | |
| download | crawl-ref-f933c8c3d6a141c76ca5e05eda5f11b6d14722c3.tar.gz crawl-ref-f933c8c3d6a141c76ca5e05eda5f11b6d14722c3.zip | |
Schedule DNGN_ENTER_PORTAL_VAULT for removal; other related fixes.
Diffstat (limited to 'crawl-ref/source/files.cc')
| -rw-r--r-- | crawl-ref/source/files.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index a046e812e8..49155ad04f 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -877,9 +877,12 @@ static int _get_dest_stair_type(branch_type old_branch, if (stair_taken >= DNGN_ENTER_DIS && stair_taken <= DNGN_ENTER_TARTARUS) return player_in_hell() ? DNGN_ENTER_HELL : stair_taken; - if (stair_taken == DNGN_ENTER_PORTAL_VAULT - || stair_taken >= DNGN_ENTER_FIRST_PORTAL - && stair_taken <= DNGN_ENTER_LAST_PORTAL) + if ( +#if TAG_MAJOR_VERSION == 34 + stair_taken == DNGN_ENTER_PORTAL_VAULT || +#endif + stair_taken >= DNGN_ENTER_FIRST_PORTAL + && stair_taken <= DNGN_ENTER_LAST_PORTAL) { return DNGN_STONE_ARCH; } @@ -982,7 +985,9 @@ static void _close_level_gates() case DNGN_ENTER_TARTARUS: case DNGN_ENTER_PANDEMONIUM: case DNGN_ENTER_LABYRINTH: +#if TAG_MAJOR_VERSION == 34 case DNGN_ENTER_PORTAL_VAULT: +#endif remove_markers_and_listeners_at(*ri); grd(*ri) = DNGN_STONE_ARCH; default: ; |