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 62ca1d6..e62ce66 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -39,21 +39,23 @@ 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:
-  std::vector<BouncyDistro> bouncy_distros;
-  std::vector<BrokenBrick>  broken_bricks;
-  std::vector<BouncyBrick>  bouncy_bricks;
-  std::vector<FloatingScore> floating_scores;
+  BadGuys bad_guys;
+  std::vector<BouncyDistro*> bouncy_distros;
+  std::vector<BrokenBrick*>  broken_bricks;
+  std::vector<BouncyBrick*>  bouncy_bricks;
+  std::vector<FloatingScore*> floating_scores;
 
   std::vector<Upgrade> upgrades;
   std::vector<Bullet> bullets;
@@ -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,6 +78,7 @@ public:
 
   void draw();
   void action(double frame_ratio);
+  void scrolling(double frame_ratio);   // camera scrolling
 
   void play_music(int musictype);
   int get_music_type();