fixed butt jump to work even when up-key is not pressed, added a little jump after...

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index 57d803d..168059a 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -39,17 +39,21 @@ class World
 {
 private:
   typedef std::list<BadGuy*> BadGuys;
-  BadGuys bad_guys;
   BadGuys bad_guys_to_add;
+  typedef std::list<Trampoline*> Trampolines;
+  Trampolines trampolines;
   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 +70,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 +80,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();
@@ -89,6 +93,7 @@ public:
   
   void activate_particle_systems();
   void activate_bad_guys();
+  void activate_objects();
 
   void add_score(float x, float y, int s);
   void add_bouncy_distro(float x, float y);
@@ -97,6 +102,7 @@ public:
   void add_bouncy_brick(float x, float y);
 
   BadGuy* add_bad_guy(float x, float y, BadGuyKind kind, bool stay_on_platform = false);
+  template <class T, class U> T* add_object(U data);
 
   void add_upgrade(float x, float y, Direction dir, UpgradeKind kind);
   void add_bullet(float x, float y, float xm, Direction dir);
@@ -105,7 +111,7 @@ public:
   void trygrabdistro(float x, float y, int bounciness);
 
   /** Try to break the brick at the given coordinates */
-  void trybreakbrick(float x, float y, bool small);
+  bool trybreakbrick(float x, float y, bool small);
 
   /** Try to get the content out of a bonus box, thus emptying it */
   void tryemptybox(float x, float y, Direction col_side);