Had a bit of time today and worked on supertux:

[supertux.git] / src / level.h

diff --git a/src/level.h b/src/level.h
index 6f29434..555138a 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -21,15 +21,13 @@
 #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
@@ -37,14 +35,15 @@ class Level
 public:
   std::string name;
   std::string author;
-  int time_left;
-  typedef std::map<std::string, Sector*> Sectors;
+  int timelimit;
+  typedef std::vector<Sector*> Sectors;
   Sectors sectors;
 
 public:
   Level();
   ~Level();
 
+  // loads a levelfile
   void load(const std::string& filename);
   void save(const std::string& filename);
 
@@ -54,15 +53,18 @@ public:
   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);
 
+  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*/