This commit breaks save file compatability.

Lots of new things that amuse/stimulate Xom, and a few things which
don't amuse him as much anymore.  Among the new things is a corpse
turning into a skeleton while butchering it; if this is too harsh to
do just for Xom's amusement (previously turning into a skeleton while
butchering was an ignored case and still produced chunks of flesh) it
can be changed back.  Also, if a Xom worshiper draws the Blank card,
Xom makes it act like a Xom card, since a plain old Blank card is boring.

Keep track of which branch the Orb is in, if the player isn't carrying
it.

Keep track of how/why the player ended up in a particular level type
(Abyss, Pan, etc).

Changed most "a distortion effect" cause strings for distortion caused
tranlsocation miscast effects to something more specific.

Added new wizard commands 'C' to curse or uncruse an item, and 'Ctrl-A'
to re-generate the Abyss.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2256 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 1 deletions

diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index 9ddc1a1d0a..d587f56c38 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -18,7 +18,8 @@ enum branch_flag_type
 
     BFLAG_NO_TELE_CONTROL = (1 << 0), // Teleport control not allowed.
     BFLAG_NOT_MAPPABLE    = (1 << 1), // Branch levels not mappable.
-    BFLAG_NO_MAGIC_MAP    = (1 << 2)  // Branch levels can't be magic mapped.
+    BFLAG_NO_MAGIC_MAP    = (1 << 2), // Branch levels can't be magic mapped.
+    BFLAG_HAS_ORB         = (1 << 3)  // Orb is on the floor in this branch
 };
 
 struct Branch