- Refactored worldmap a bit to reuse GameObject from the rest of the game

[supertux.git] / src / level.h

diff --git a/src/level.h b/src/level.h
index a264353..18d1803 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -21,31 +21,22 @@
 #ifndef SUPERTUX_LEVEL_H
 #define SUPERTUX_LEVEL_H
 
-#include <map>
+#include <vector>
 #include <string>
 
-using namespace SuperTux;
-
 class Sector;
 
-namespace SuperTux {
-class LispReader;
+namespace lisp {
+class Lisp;
 }
 
 class Level
 {
 public:
-  enum EndSequenceType{
-    NONE_ENDSEQ_ANIM,
-    FIREWORKS_ENDSEQ_ANIM
-  };
-
   std::string name;
   std::string author;
-  int timelimit;
-  typedef std::map<std::string, Sector*> Sectors;
+  typedef std::vector<Sector*> Sectors;
   Sectors sectors;
-  EndSequenceType end_sequence_type;
 
 public:
   Level();
@@ -55,32 +46,24 @@ public:
   void load(const std::string& filename);
   void save(const std::string& filename);
 
-  EndSequenceType get_end_sequence_type() const
-  { return end_sequence_type; }
-
   const std::string& get_name() const
   { return name; }
 
   const std::string& get_author() const
   { return author; }
 
-  /** Flips the level vertically */
-  void do_vertical_flip();
-
   void add_sector(Sector* sector);
 
   Sector* get_sector(const std::string& name);
 
-  Sector* get_next_sector(const Sector* sector);
-  Sector* get_previous_sector(const Sector* sector);
-
-  int get_total_sectors();
+  size_t get_sector_count();
+  Sector* get_sector(size_t num);
 
   int get_total_badguys();
   int get_total_coins();
 
 private:
-  void load_old_format(LispReader& reader);
+  void load_old_format(const lisp::Lisp& reader);
 };
 
 #endif /*SUPERTUX_LEVEL_H*/