diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-20 19:31:09 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-20 20:33:21 +0100 |
commit | 05eb29bffa0b2ffd22d36a16c93bc33c7d2bd3fc (patch) | |
tree | 5df5b435ac5699a9e4d1368784baa21adbf00258 /crawl-ref/source/branch.cc | |
parent | ab09f427ff764fa65c9093a168cdade396ea4609 (diff) | |
download | crawl-ref-05eb29bffa0b2ffd22d36a16c93bc33c7d2bd3fc.tar.gz crawl-ref-05eb29bffa0b2ffd22d36a16c93bc33c7d2bd3fc.zip |
Move Tomb branch flag no_tele_control from crypt.des to branch.cc.
This fixes shaft traps being generated on Tomb:1; apparently,
BFLAGS: was being interpreted after placing traps on the level;
shaft traps are not placed in no-telecontrol levels.
A better fix would be to make sure BFLAGS is called earlier.
Alternatively, BFLAGS could be remove -- it doesn't appear
to be used any more.
Diffstat (limited to 'crawl-ref/source/branch.cc')
-rw-r--r-- | crawl-ref/source/branch.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 3c632e5ea9..bcb5c69938 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -262,7 +262,8 @@ Branch branches[] = { NULL, NULL, NULL, NULL, 5, 'C', false, false }, - { BRANCH_TOMB, BRANCH_CRYPT, 3, 5, BFLAG_ISLANDED, 0, + { BRANCH_TOMB, BRANCH_CRYPT, 3, 5, + BFLAG_ISLANDED | BFLAG_NO_TELE_CONTROL, 0, DNGN_ENTER_TOMB, DNGN_RETURN_FROM_TOMB, "Tomb", "the Tomb of the Ancients", "Tomb", NULL, |