More branch entry vaults (Erik).

Changed behaviour when using KMONS and KITEM without a corresponding KFEAT.
Previously this would force the dungeon feature of that square to plain floor.
The new behaviour is to try to map the glyph to itself. For instance:
KMONS: O = pandemonium demon
will place a pandemonium demon on the rune, whereas previously it would place
the pan demon on a floor square.

Tossed out old waypoint hacks. Waypoints are now handled in the same way as
travel to stash search places. This ought to fix the waypoint corruption issues.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index 278bf6bbed..5c5ec9b810 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -250,12 +250,14 @@ struct feature_slot
     bool fix_slot;
 
     feature_slot();
-    feature_spec get_feat();
+    feature_spec get_feat(int default_glyph);
 };
 
 struct keyed_mapspec
 {
 public:
+    int          key_glyph;
+    
     feature_slot feat;
     item_list    item;
     mons_list    mons;
@@ -269,7 +271,7 @@ public:
 
     feature_spec get_feat();
     mons_spec get_mons();
-    item_spec get_item();
+    item_list &get_items();
 
 private:
     std::string err;