fix tiles being 1 pixel off their correct position

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index 05f54d2..d886cd3 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -29,10 +29,13 @@
 #include "special.h"
 #include "badguy.h"
 #include "particlesystem.h"
-#include "gameobjs.h"
-#include "display_manager.h"
+#include "screen/drawing_context.h"
 
+class Camera;
 class Level;
+class Background;
+class Trampoline;
+class FlyingPlatform;
 
 /** The World class holds a level and all the game objects (badguys,
     bouncy distros, etc) that are needed to run a game. */
@@ -43,10 +46,10 @@ private:
   BadGuys bad_guys_to_add;
   typedef std::list<Trampoline*> Trampolines;
   Trampolines trampolines;
+  typedef std::list<FlyingPlatform*> FlyingPlatforms;
+  FlyingPlatforms flying_platforms;
   Level* level;
-  Player tux;
-
-  Timer scrolling_timer;
+  Player* tux;
 
   int distro_counter;
   bool counting_distros;
@@ -54,44 +57,48 @@ private:
 
   static World* current_;
 public:
+  Background* background;
   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;
+  Camera* camera;
+  DrawingContext context;
 
 public:
-  static World* current() { return current_; }
-  static void set_current(World* w) { current_ = w; }
+  static World* current()
+  { return current_; }
+  static void set_current(World* w)
+  { current_ = w; }
 
-  World(const std::string& filename);
-  World(const std::string& subset, int level_nr);
-  World() {};
+  World(const std::string& filename, int level_nr = -1);
   ~World();
   
-  Level*  get_level() { return level; }
-  Player* get_tux() { return &tux; }
+  Level*  get_level()
+  { return level; }
+  Player* get_tux()
+  { return tux; }
+
+  void add_object(GameObject* object);
 
   void set_defaults();
 
   void draw();
-  void action(double frame_ratio);
-  void scrolling(double frame_ratio);   // camera scrolling
+  void action(float elapsed_time);
 
   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 +107,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);
+  bool 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);