fix jerky scrolling

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index 0f82244..04e00c6 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -56,9 +56,9 @@ private:
 public:
   BadGuys bad_guys;
 
-  std::vector<Upgrade> upgrades;
-  std::vector<Bullet> bullets;
-  std::vector<_GameObject*> gameobjects;
+  std::vector<Upgrade*> upgrades;
+  std::vector<Bullet*> bullets;
+  std::vector<GameObject*> gameobjects;
 
   DisplayManager displaymanager;
 
@@ -68,12 +68,14 @@ 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; }
 
+  void add_object(GameObject* object);
+
   void set_defaults();
 
   void draw();
@@ -82,16 +84,15 @@ public:
 
   void play_music(int musictype);
   int get_music_type();
-  
 
   /** Checks for all possible collisions. And calls the
       collision_handlers, which the collision_objects provide for this
       case (or not). */
   void collision_handler();
+
+  void parse_objects(lisp_object_t* cur);
   
   void activate_particle_systems();
-  void activate_bad_guys();
-  void activate_objects();
 
   void add_score(const Vector& pos, int s);
   void add_bouncy_distro(const Vector& pos);
@@ -100,11 +101,10 @@ public:
       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);
+  BadGuy* add_bad_guy(float x, float y, BadGuyKind kind);
 
-  void add_upgrade(float x, float y, Direction dir, UpgradeKind kind);
-  void add_bullet(float x, float y, float xm, Direction dir);
+  void add_upgrade(const Vector& pos, Direction dir, UpgradeKind kind);
+  void add_bullet(const Vector& pos, float xm, Direction dir);
 
   /** Try to grab the coin at the given coordinates */
   void trygrabdistro(float x, float y, int bounciness);