diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-30 14:53:43 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-30 14:53:43 +0000 |
| commit | bea976d08dce60216db7a422aa6dc687c55860d7 (patch) | |
| tree | f51d9df3c563933342e621341288c494a62ff873 /crawl-ref | |
| parent | 771896e7091c766da22380885247f13d094096c0 (diff) | |
| download | crawl-ref-bea976d08dce60216db7a422aa6dc687c55860d7.tar.gz crawl-ref-bea976d08dce60216db7a422aa6dc687c55860d7.zip | |
Apply trunk r10463 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10464 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/xom.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 8a6433e8a4..48a5beaa95 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -3073,7 +3073,8 @@ void xom_acts(bool niceness, int sever, int tension) static void _xom_check_less_runes(int runes_gone) { - if (player_in_branch(BRANCH_HALL_OF_ZOT) + if (you.opened_zot + || player_in_branch(BRANCH_HALL_OF_ZOT) || !(branches[BRANCH_HALL_OF_ZOT].branch_flags & BFLAG_HAS_ORB)) { return; |