Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index 57d803d..e62ce66 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -39,17 +39,19 @@ class World
 {
 private:
   typedef std::list<BadGuy*> BadGuys;
-  BadGuys bad_guys;
   BadGuys bad_guys_to_add;
   Level* level;
   Player tux;
 
+  Timer scrolling_timer;
+
   int distro_counter;
   bool counting_distros;
   int currentmusic;
 
   static World* current_;
 public:
+  BadGuys bad_guys;
   std::vector<BouncyDistro*> bouncy_distros;
   std::vector<BrokenBrick*>  broken_bricks;
   std::vector<BouncyBrick*>  bouncy_bricks;
@@ -66,7 +68,7 @@ public:
 
   World(const std::string& filename);
   World(const std::string& subset, int level_nr);
-  World();
+  World() {};
   ~World();
   
   Level*  get_level() { return level; }
@@ -76,7 +78,7 @@ public:
 
   void draw();
   void action(double frame_ratio);
-  void keep_in_bounds();
+  void scrolling(double frame_ratio);   // camera scrolling
 
   void play_music(int musictype);
   int get_music_type();