diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-14 10:58:08 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-14 10:58:08 +0000 |
commit | 5f0047a46771cbb691ed76feb3a66d8bbbaf674d (patch) | |
tree | 42a42851c04160c9975058a8bad2f807e8005bf7 /crawl-ref/source/acr.cc | |
parent | 1de6c3e73bc19e4c7c6573ce3be9d77befd4cf02 (diff) | |
download | crawl-ref-5f0047a46771cbb691ed76feb3a66d8bbbaf674d.tar.gz crawl-ref-5f0047a46771cbb691ed76feb3a66d8bbbaf674d.zip |
Another round of patches, namely:
1794580, 1794576 and 1794376 by zelgadis, and
1794388, 1794372, 1794368 by dolorous.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2086 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r-- | crawl-ref/source/acr.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index f22d2fbf48..5e0cf7eb1b 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -782,10 +782,19 @@ static void handle_wizard_command( void ) case ':': j = 0; for (i = 0; i < NUM_BRANCHES; i++) + { if (branches[i].startdepth != - 1) + { mprf(MSGCH_DIAGNOSTICS, "Branch %d (%s) is on level %d of %s", i, branches[i].longname, branches[i].startdepth, branches[branches[i].parent_branch].abbrevname); + } + else if (i == BRANCH_SWAMP || i == BRANCH_SHOALS) + { + mprf(MSGCH_DIAGNOSTICS, "Branch %d (%s) was not generated " + "this game", i, branches[i].longname); + } + } break; case '{': @@ -1516,7 +1525,7 @@ void process_command( command_type cmd ) if (Options.tutorial_events[TUT_MAP_VIEW]) Options.tutorial_events[TUT_MAP_VIEW] = 0; #if (!DEBUG_DIAGNOSTICS) - if (you.level_type == LEVEL_LABYRINTH || you.level_type == LEVEL_ABYSS) + if (!player_in_mappable_area()) { mpr("It would help if you knew where you were, first."); break; |