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 2ae7e0b..d886cd3 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -29,11 +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. */
@@ -44,11 +46,11 @@ 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;
-
   int distro_counter;
   bool counting_distros;
   int currentmusic;
@@ -62,19 +64,22 @@ public:
   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);
 
@@ -82,7 +87,6 @@ public:
 
   void draw();
   void action(float elapsed_time);
-  void scrolling(float elapsed_time);   // camera scrolling
 
   void play_music(int musictype);
   int get_music_type();
@@ -106,7 +110,7 @@ public:
   BadGuy* add_bad_guy(float x, float y, BadGuyKind kind);
 
   void add_upgrade(const Vector& pos, Direction dir, UpgradeKind kind);
-  void add_bullet(const Vector& pos, float xm, Direction dir);
+  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);