New overview screen (the 'O' screen.)

This involves changes in quite a few things, so the major savefile version
is now 1, and old savefiles *will not load*!
Lots of conditional loading code has therefore been removed.
Minor savefile version dropped to 0 in everything.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@495 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 e53aaa8dac..bd6e4221bc 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -116,6 +116,10 @@ struct level_id
 
     level_id(unsigned char br, int dep) : branch(br), depth(dep) { }
 
+    unsigned short packed_place() const;
+
+    std::string describe( bool long_name, bool with_number ) const;
+
     // Returns the level_id of the current level.
     static level_id get_current_level_id();
 
@@ -133,6 +137,11 @@ struct level_id
         return branch != id.branch || depth != id.depth;
     }
 
+    bool operator <( const level_id &id ) const
+    {
+        return (branch < id.branch) || (branch==id.branch && depth < id.depth);
+    }
+
     struct less_than
     {
         bool operator () (const level_id &first, const level_id &second) const
@@ -177,6 +186,11 @@ struct level_pos
     {
         return id != lp.id || pos != lp.pos;
     }
+
+    bool operator <  ( const level_pos &lp ) const
+    {
+        return (id < lp.id) || (id == lp.id && pos < lp.pos);
+    }
     
     bool is_valid() const
     {