projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled file back to version from master, due to improper merge
[supertux.git]
/
src
/
object
/
particles.hpp
diff --git
a/src/object/particles.hpp
b/src/object/particles.hpp
index
55c2b1a
..
8582665
100644
(file)
--- a/
src/object/particles.hpp
+++ b/
src/object/particles.hpp
@@
-35,6
+35,17
@@
public:
virtual void draw(DrawingContext& context);
private:
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
+54,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;
};