projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence compiler warning
[supertux.git]
/
src
/
object
/
particles.hpp
diff --git
a/src/object/particles.hpp
b/src/object/particles.hpp
index
9c353ee
..
f9f18a0
100644
(file)
--- a/
src/object/particles.hpp
+++ b/
src/object/particles.hpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// This program is free software
; you can redistribute it and/or
-//
modify it under the terms of the GNU General Public License
-//
as published by the Free Software Foundation; either version 2
-//
of the License, or
(at your option) any later version.
+// This program is free software
: you can redistribute it and/or modify
+//
it under the terms of the GNU General Public License as published by
+//
the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,15
+12,14
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef
SUPERTUX
_PARTICLES_HPP
-#define
SUPERTUX
_PARTICLES_HPP
+#ifndef
HEADER_SUPERTUX_OBJECT
_PARTICLES_HPP
+#define
HEADER_SUPERTUX_OBJECT
_PARTICLES_HPP
#include "math/vector.hpp"
#include "math/vector.hpp"
-#include "game_object.hpp"
-#include "timer.hpp"
+#include "
supertux/
game_object.hpp"
+#include "
supertux/
timer.hpp"
#include "video/color.hpp"
class Particles : public GameObject
#include "video/color.hpp"
class Particles : public GameObject
@@
-32,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;
@@
-46,11
+58,9
@@
private:
float size;
int drawing_layer;
float size;
int drawing_layer;
- struct Particle {
- Vector pos, vel;
-// float angle;
- };
std::vector <Particle*> particles;
};
#endif
std::vector <Particle*> particles;
};
#endif
+
+/* EOF */