projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a Segmentation Fault when mr_iceblock was kicked into a brick containing coins...
[supertux.git]
/
src
/
object
/
particles.hpp
diff --git
a/src/object/particles.hpp
b/src/object/particles.hpp
index
55c2b1a
..
f9f18a0
100644
(file)
--- a/
src/object/particles.hpp
+++ b/
src/object/particles.hpp
@@
-29,12
+29,27
@@
public:
const Vector& initial_velocity, const Vector& acceleration,
int number, Color color, int size, float life_time,
int drawing_layer);
const Vector& initial_velocity, const Vector& acceleration,
int number, Color color, int size, float life_time,
int drawing_layer);
+ Particles(const Vector& epicenter, int min_angle, int max_angle,
+ const float min_initial_velocity, const float max_initial_velocity,
+ const Vector& acceleration, int number, Color color,
+ int size, float life_time, int drawing_layer);
~Particles();
virtual void update(float elapsed_time);
virtual void draw(DrawingContext& context);
private:
~Particles();
virtual void update(float elapsed_time);
virtual void draw(DrawingContext& context);
private:
+ struct Particle {
+ Vector pos, vel;
+
+ Particle() :
+ pos(),
+ vel()
+ {}
+ // float angle;
+ };
+
+private:
Vector accel;
Timer timer;
bool live_forever;
Vector accel;
Timer timer;
bool live_forever;
@@
-43,10
+58,6
@@
private:
float size;
int drawing_layer;
float size;
int drawing_layer;
- struct Particle {
- Vector pos, vel;
- // float angle;
- };
std::vector <Particle*> particles;
};
std::vector <Particle*> particles;
};