Finally!!

[supertux.git] / src / world.h

diff --git a/src/world.h b/src/world.h
index c3eda1d..db383e2 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -50,12 +50,16 @@ class World
   std::vector<Bullet> bullets;
   std::vector<ParticleSystem*> particle_systems;
 
-  static World* current_;
+  int distro_counter;
+  bool counting_distros;
 
+  static World* current_;
  public:
   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();
   
@@ -65,23 +69,13 @@ class World
   void set_defaults();
 
   void draw();
-  void action();
+  void action(double frame_ratio);
 
   /** Checks for all possible collisions. And calls the
       collision_handlers, which the collision_objects provide for this
       case (or not). */
   void collision_handler();
   
-  void arrays_free();
-
-  /** Load data for this level: 
-      Returns -1, if the loading of the level failed. */
-  int  load(const std::string& subset, int level);
-
-  /** Load data for this level: 
-      Returns -1, if the loading of the level failed. */
-  int  load(const std::string& filename);
-
   void activate_particle_systems();
   void activate_bad_guys();
 
@@ -113,3 +107,7 @@ extern World global_world;
 
 #endif /*SUPERTUX_WORLD_H*/
 
+/* Local Variables: */
+/* mode:c++ */
+/* End: */
+