diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-02-24 05:34:35 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-02-24 05:34:35 +0100 |
| commit | 65306b0f297ae9ce4a5b2a52f055a2f2482dbad2 (patch) | |
| tree | 376bb1bec86026fdc5317a0299ade45d788f8ef7 /crawl-ref/source/branch-data.h | |
| parent | b957c737d34260acddc671a3c7bbe9cb810665c0 (diff) | |
| parent | e8f008ab92473c7cc7a26b7a8504733b7c80a407 (diff) | |
| download | crawl-ref-65306b0f297ae9ce4a5b2a52f055a2f2482dbad2.tar.gz crawl-ref-65306b0f297ae9ce4a5b2a52f055a2f2482dbad2.zip | |
Merge branch 'master' into mon-pick
Sorry for merge commits, but rerere is pretty limited.
Diffstat (limited to 'crawl-ref/source/branch-data.h')
| -rw-r--r-- | crawl-ref/source/branch-data.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/branch-data.h b/crawl-ref/source/branch-data.h index fb4b297756..17fe3b2413 100644 --- a/crawl-ref/source/branch-data.h +++ b/crawl-ref/source/branch-data.h @@ -285,6 +285,16 @@ const Branch branches[NUM_BRANCHES] = { NULL, false, LIGHTGREY, BROWN, // set per-map '8', false, 0 }, + +#if TAG_MAJOR_VERSION == 34 + { BRANCH_UNUSED, NUM_BRANCHES, -1, -1, 0, 0, + BFLAG_NO_XLEV_TRAVEL | BFLAG_NO_ITEMS, 0, + DNGN_ENTER_PORTAL_VAULT, DNGN_EXIT_PORTAL_VAULT, + "Void", "a void", "Void", + NULL, + false, LIGHTGREY, BROWN, + '9', false, 0 }, +#endif }; #endif |