X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworld.h;h=00ea9a05661a6df15471723745f7d754d8923dc0;hb=63934f5f4c15f059c9b60499575870ebb7c923a0;hp=e655e462005a255d9a021f28cdf640a5ab9288fb;hpb=1cb0101ce7c9983bfd83c3d6bcd1b6c2747adaf8;p=supertux.git

diff --git a/src/world.h b/src/world.h
index e655e4620..00ea9a056 100644
--- a/src/world.h
+++ b/src/world.h
@@ -1,7 +1,9 @@
 //  $Id$
 // 
 //  SuperTux
-//  Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -25,15 +27,20 @@
 #include "type.h"
 #include "scene.h"
 #include "special.h"
+#include "badguy.h"
 #include "particlesystem.h"
 #include "gameobjs.h"
 
+class Level;
+
 /** The World class holds a level and all the game objects (badguys,
     bouncy distros, etc) that are needed to run a game. */
 class World
 {
  public:
   Level* level;
+
+  Player tux;
   
   std::vector<BouncyDistro> bouncy_distros;
   std::vector<BrokenBrick>  broken_bricks;
@@ -41,39 +48,36 @@ class World
   std::vector<FloatingScore> floating_scores;
 
   std::vector<BadGuy> bad_guys;
-  std::vector<upgrade_type> upgrades;
-  std::vector<bullet_type> bullets;
+  std::vector<Upgrade> upgrades;
+  std::vector<Bullet> bullets;
   std::vector<ParticleSystem*> particle_systems;
 
+  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();
   
-  Level* get_level() { return level; }
+  Level*  get_level() { return level; }
+  Player* get_tux() { return &tux; }
 
   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 char* 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();
 
@@ -83,8 +87,8 @@ class World
   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_bad_guy(float x, float y, BadGuyKind kind);
-  void add_upgrade(float x, float y, int dir, int kind);
-  void add_bullet(float x, float y, float xm, int dir);
+  void add_upgrade(float x, float y, Direction dir, UpgradeKind kind);
+  void add_bullet(float x, float y, float xm, Direction dir);
 
   /** Try to grab the coin at the given coordinates */
   void trygrabdistro(float x, float y, int bounciness);
@@ -93,7 +97,7 @@ class World
   void 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, int col_side);
+  void tryemptybox(float x, float y, Direction col_side);
 
   /** Try to bumb a badguy that might we walking above Tux, thus shaking
       the tile which the badguy is walking on an killing him this way */
@@ -105,3 +109,7 @@ extern World global_world;
 
 #endif /*SUPERTUX_WORLD_H*/
 
+/* Local Variables: */
+/* mode:c++ */
+/* End: */
+