X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fparticlesystem_interactive.hpp;h=55bf3c5c02491f7e15f3fec06a04f811a94105e8;hb=5745d9670262c91e6cd35363fd0d2ec169e7c8a4;hp=6da680595314d0a10ee15b4b501690cba788c815;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/particlesystem_interactive.hpp b/src/object/particlesystem_interactive.hpp index 6da680595..55bf3c5c0 100644 --- a/src/object/particlesystem_interactive.hpp +++ b/src/object/particlesystem_interactive.hpp @@ -50,11 +50,11 @@ class ParticleSystem_Interactive : public GameObject public: ParticleSystem_Interactive(); virtual ~ParticleSystem_Interactive(); - + virtual void draw(DrawingContext& context); protected: - int layer; + int z_pos; class Particle { @@ -65,7 +65,7 @@ protected: Vector pos; Surface* texture; }; - + std::vector particles; float virtual_width, virtual_height; int collision(Particle* particle, Vector movement); @@ -84,14 +84,14 @@ public: std::string type() const { return "RainParticleSystem"; } - + private: class RainParticle : public Particle { public: float speed; }; - + Surface* rainimages[2]; }; @@ -108,16 +108,15 @@ public: std::string type() const { return "CometParticleSystem"; } - + private: class CometParticle : public Particle { public: float speed; }; - + Surface* cometimages[2]; }; #endif -