- fixed 'When you jump into the roof or a bonus and fall back down you collide with...

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index 661cb08..072386f 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -49,8 +49,6 @@ private:
   Level* level;
   Player* tux;
 
-  Timer scrolling_timer;
-
   int distro_counter;
   bool counting_distros;
   int currentmusic;
@@ -68,16 +66,18 @@ public:
   DisplayManager displaymanager;
 
 public:
-  static World* current() { return current_; }
-  static void set_current(World* w) { current_ = w; }
+  static World* current()
+  { return current_; }
+  static void set_current(World* w)
+  { current_ = w; }
 
-  World(const std::string& filename);
-  World(const std::string& subset, int level_nr);
-  //World() {};
+  World(const std::string& filename, int level_nr = -1);
   ~World();
   
-  Level*  get_level() { return level; }
-  Player* get_tux() { return tux; }
+  Level*  get_level()
+  { return level; }
+  Player* get_tux()
+  { return tux; }
 
   void add_object(GameObject* object);