converted player to new object system

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index 62ca1d6..0f82244 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -30,6 +30,7 @@
 #include "badguy.h"
 #include "particlesystem.h"
 #include "gameobjs.h"
+#include "display_manager.h"
 
 class Level;
 
@@ -39,10 +40,13 @@ 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;
+  Player* tux;
+
+  Timer scrolling_timer;
 
   int distro_counter;
   bool counting_distros;
@@ -50,15 +54,13 @@ private:
 
   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<Upgrade> upgrades;
   std::vector<Bullet> bullets;
-  typedef std::vector<ParticleSystem*> ParticleSystems;
-  ParticleSystems particle_systems;
+  std::vector<_GameObject*> gameobjects;
+
+  DisplayManager displaymanager;
 
 public:
   static World* current() { return current_; }
@@ -66,16 +68,17 @@ public:
 
   World(const std::string& filename);
   World(const std::string& subset, int level_nr);
-  World();
+  World() {};
   ~World();
   
   Level*  get_level() { return level; }
-  Player* get_tux() { return &tux; }
+  Player* get_tux() { return tux; }
 
   void set_defaults();
 
   void draw();
   void action(double frame_ratio);
+  void scrolling(double frame_ratio);   // camera scrolling
 
   void play_music(int musictype);
   int get_music_type();
@@ -88,14 +91,17 @@ 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);
-  void add_broken_brick(Tile* tile, float x, float y);
-  void add_broken_brick_piece(Tile* tile, float x, float y, float xm, float ym);
-  void add_bouncy_brick(float x, float y);
+  void add_score(const Vector& pos, int s);
+  void add_bouncy_distro(const Vector& pos);
+  void add_broken_brick(const Vector& pos, Tile* tile);
+  void add_broken_brick_piece(const Vector& pos,
+      const Vector& movement, Tile* tile);
+  void add_bouncy_brick(const Vector& pos);
 
   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);
@@ -104,7 +110,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);