This change moves the logic for when a level or branch prohibits

teleport control from the C++ code into the vault .des files.  This is
done with the additions of two things:

* Changeable, persistent per-level and per-branch flags which affect
  game play.

* Dungeon events for the killing of monsters, picking up of objects
  and changing of features.

The current level and branch flags are for teleport control
prevention, making a level unmappable (like the Abyss or a Labyrinth),
and preventing magic mapping from working (like the Abyss or a
Labyrinth).

Some related changes:

* The new .des header KMASK allows for dungeon grid masks like
  no_monster_gen to be applied to specific symbols rather than the
  entire vault.

* If the wizard mapping command (&{) is used in a place which is
  unmappable, it will ask if you wish to force the area to be mappable
  (so you can see what an entire Labyrinth or Abyss level looks like
  without having to hack the source).

* A new wizard-mode level-map command, 'T', will teleport the player
  to wherever the cursor is pointing.


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

1 files changed, 17 insertions, 0 deletions

diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index 009bb89bca..9ddc1a1d0a 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -12,6 +12,15 @@
 
 #include "enum.h"
 
+enum branch_flag_type
+{
+    BFLAG_NONE = 0,
+
+    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.
+};
+
 struct Branch
 {
     branch_type id;
@@ -19,6 +28,8 @@ struct Branch
     int depth;
     int startdepth;             // which level of the parent branch,
                                 // 1 for first level
+    unsigned long branch_flags;
+    unsigned long default_level_flags;
     dungeon_feature_type entry_stairs;
     dungeon_feature_type exit_stairs;
     const char* shortname;      // "Slime Pits"
@@ -42,4 +53,10 @@ Branch& your_branch();
 branch_type str_to_branch(const std::string &branch,
                           branch_type err = NUM_BRANCHES);
 
+bool set_branch_flags(unsigned long flags, bool silent = false,
+                      branch_type branch = NUM_BRANCHES);
+bool unset_branch_flags(unsigned long flags, bool silent = false,
+                        branch_type branch = NUM_BRANCHES);
+unsigned long get_branch_flags(branch_type branch = NUM_BRANCHES);
+
 #endif