projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
found some values for tux' flapping speed that feel okay when running (still a little...
[supertux.git]
/
src
/
gameobjs.h
diff --git
a/src/gameobjs.h
b/src/gameobjs.h
index
051c0ea
..
197273f
100644
(file)
--- a/
src/gameobjs.h
+++ b/
src/gameobjs.h
@@
-91,17
+91,18
@@
private:
TileId& shape;
};
TileId& shape;
};
-class Floating
Score
: public GameObject
+class Floating
Text
: public GameObject
{
public:
{
public:
- FloatingScore(const Vector& pos, int s);
+ FloatingText(const Vector& pos, const std::string& text_);
+ FloatingText(const Vector& pos, int s); // use this for score, for instance
virtual void action(float elapsed_time);
virtual void draw(DrawingContext& context);
private:
Vector position;
virtual void action(float elapsed_time);
virtual void draw(DrawingContext& context);
private:
Vector position;
-
char str[10]
;
+
std::string text
;
Timer timer;
};
Timer timer;
};
@@
-190,6
+191,7
@@
private:
float size;
Vector vel, accel;
Timer timer;
float size;
Vector vel, accel;
Timer timer;
+ bool live_forever;
struct Particle {
Vector pos;
struct Particle {
Vector pos;