projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cr/lfs and remove trailing whitespaces...
[supertux.git]
/
src
/
object
/
particlesystem_interactive.hpp
diff --git
a/src/object/particlesystem_interactive.hpp
b/src/object/particlesystem_interactive.hpp
index
3bb7313
..
55bf3c5
100644
(file)
--- a/
src/object/particlesystem_interactive.hpp
+++ b/
src/object/particlesystem_interactive.hpp
@@
-50,7
+50,7
@@
class ParticleSystem_Interactive : public GameObject
public:
ParticleSystem_Interactive();
virtual ~ParticleSystem_Interactive();
public:
ParticleSystem_Interactive();
virtual ~ParticleSystem_Interactive();
-
+
virtual void draw(DrawingContext& context);
protected:
virtual void draw(DrawingContext& context);
protected:
@@
-65,7
+65,7
@@
protected:
Vector pos;
Surface* texture;
};
Vector pos;
Surface* texture;
};
-
+
std::vector<Particle*> particles;
float virtual_width, virtual_height;
int collision(Particle* particle, Vector movement);
std::vector<Particle*> particles;
float virtual_width, virtual_height;
int collision(Particle* particle, Vector movement);
@@
-84,14
+84,14
@@
public:
std::string type() const
{ return "RainParticleSystem"; }
std::string type() const
{ return "RainParticleSystem"; }
-
+
private:
class RainParticle : public Particle
{
public:
float speed;
};
private:
class RainParticle : public Particle
{
public:
float speed;
};
-
+
Surface* rainimages[2];
};
Surface* rainimages[2];
};
@@
-108,16
+108,15
@@
public:
std::string type() const
{ return "CometParticleSystem"; }
std::string type() const
{ return "CometParticleSystem"; }
-
+
private:
class CometParticle : public Particle
{
public:
float speed;
};
private:
class CometParticle : public Particle
{
public:
float speed;
};
-
+
Surface* cometimages[2];
};
#endif
Surface* cometimages[2];
};
#endif
-