X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworld.h;h=ea27610231af3cc876ecd21de0182392fcb138fe;hb=ee6db785e8eff4883da70b404a9bdb4a42e75ac3;hp=c3eda1d8e2a7c273644d6e5bdbc257ac20339f39;hpb=a4c78a43edd48c0908a2f723d194e1aa8c806251;p=supertux.git diff --git a/src/world.h b/src/world.h index c3eda1d8e..ea2761023 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 +// Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2004 Ingo Ruhnke // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -50,12 +52,16 @@ class World std::vector bullets; std::vector 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 +71,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(); @@ -90,9 +86,9 @@ class World void add_broken_brick(Tile* tile, float x, float y); 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_bad_guy(float x, float y, BadGuyKind kind, bool stay_on_platform = false); + 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); @@ -101,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 */ @@ -113,3 +109,7 @@ extern World global_world; #endif /*SUPERTUX_WORLD_H*/ +/* Local Variables: */ +/* mode:c++ */ +/* End: */ +