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, 14 deletions

diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index 1490f9df56..d60311b07c 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -301,15 +301,9 @@ struct stair_info
 // Information on a level that interlevel travel needs.
 struct LevelInfo
 {
-    LevelInfo() : stairs()
+    LevelInfo() : stairs(), excludes(), stair_distances(), id()
     {
-        stair_distances = NULL;
     }
-    LevelInfo(const LevelInfo &li);
-
-    ~LevelInfo();
-
-    const LevelInfo &operator = (const LevelInfo &other);
 
     void save(FILE *) const;
     void load(FILE *);
@@ -345,10 +339,6 @@ struct LevelInfo
     // current level.
     bool is_known_branch(unsigned char branch) const;
 
-    void add_waypoint(const coord_def &pos);
-    void remove_waypoint(const coord_def &pos);
-
-    void travel_to_waypoint(const coord_def &pos);
 private:
     // Gets a list of coordinates of all player-known stairs on the current
     // level.
@@ -366,7 +356,7 @@ private:
     // Squares that are not safe to travel to.
     std::vector<coord_def> excludes;
 
-    short *stair_distances;       // Distances between the various stairs
+    std::vector<short> stair_distances;  // Dist between stairs
     level_id id;
 
     friend class TravelCache;
@@ -491,8 +481,8 @@ protected:
     void good_square(const coord_def &c);
 
 protected:
-    static const int UNFOUND_DIST  = -10000;
-    static const int INFINITE_DIST =  10000;
+    static const int UNFOUND_DIST  = -30000;
+    static const int INFINITE_DIST =  30000;
     
 protected:
     run_mode_type runmode;