From 05eb29bffa0b2ffd22d36a16c93bc33c7d2bd3fc Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Fri, 20 Nov 2009 19:31:09 +0100 Subject: 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. --- crawl-ref/source/branch.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/branch.cc') 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, -- cgit v1.2.3-54-g00ecf