Merged trunk fixes back to 0.2:

- Moth of wrath rage attack.
- Pulsating lump mutation attack.
- Combat messages for out-of-view monsters fighting monsters in LOS.
- Waypoint deletion.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1449 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 14 insertions, 0 deletions

diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index d60311b07c..eb8f1abd13 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -162,6 +162,13 @@ public:
     unsigned short packed_place() const;
     std::string describe(bool long_name = false, bool with_number = true) const;
 
+    void reset()
+    {
+        branch = 0;
+        depth  = -1;
+        level_type = LEVEL_DUNGEON;
+    }
+    
     bool is_valid() const
     {
         return (branch != -1 && depth != -1) || level_type != LEVEL_DUNGEON;
@@ -234,6 +241,12 @@ struct level_pos
         return id.depth > -1 && pos.x != -1 && pos.y != -1;
     }
 
+    void reset()
+    {
+        id.reset();
+        pos = coord_def(-1, -1);
+    }
+
     void save(FILE *) const;
     void load(FILE *);
 };
@@ -404,6 +417,7 @@ public:
     void set_level_excludes();
 
     void add_waypoint(int x = -1, int y = -1);
+    void delete_waypoint();
     unsigned char is_waypoint(const level_pos &lp) const;
     void list_waypoints() const;
     void travel_to_waypoint(int number);