diff options
| author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-17 11:21:46 +0000 |
|---|---|---|
| committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-17 11:21:46 +0000 |
| commit | eda11ccd07fd9869b193d33490d456a56649b4de (patch) | |
| tree | 563c852ef66130b7edaaa7be98ef2c1cb6f61a4f /crawl-ref/source/branch.cc | |
| parent | 775337dbac8f614e6152ae0c0ea37757cc4d344e (diff) | |
| download | crawl-ref-eda11ccd07fd9869b193d33490d456a56649b4de.tar.gz crawl-ref-eda11ccd07fd9869b193d33490d456a56649b4de.zip | |
bug 1916515: Roll back a portion of r3460 which broke zot. But why?
Will leave bug open until we find out.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3689 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/branch.cc')
| -rw-r--r-- | crawl-ref/source/branch.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 66512cdf06..1cfa5fe251 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -284,15 +284,6 @@ Branch branches[] = { NULL, NULL, NULL, NULL, 0, 'Y', true, true }, - { BRANCH_HALL_OF_ZOT, BRANCH_MAIN_DUNGEON, 5, 27, BFLAG_HAS_ORB, 0, - DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT, - "Zot", "the Realm of Zot", "Zot", - NULL, - false, true, BLACK, BLACK, - mons_hallzot_rare, mons_hallzot_level, - NULL, NULL, NULL, NULL, - 1, 'Z', false, true }, - { BRANCH_INFERNO, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0, NUM_FEATURES, NUM_FEATURES, NULL, NULL, NULL, @@ -311,6 +302,15 @@ Branch branches[] = { NULL, NULL, NULL, NULL, 0, '0', false, false }, + { BRANCH_HALL_OF_ZOT, BRANCH_MAIN_DUNGEON, 5, 27, BFLAG_HAS_ORB, 0, + DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT, + "Zot", "the Realm of Zot", "Zot", + NULL, + false, true, BLACK, BLACK, + mons_hallzot_rare, mons_hallzot_level, + NULL, NULL, NULL, NULL, + 1, 'Z', false, true }, + { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0, NUM_FEATURES, NUM_FEATURES, NULL, NULL, NULL, |