projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some fixes for the text object
[supertux.git]
/
src
/
object
/
gameobjs.h
diff --git
a/src/object/gameobjs.h
b/src/object/gameobjs.h
index
81a336a
..
69b0f26
100644
(file)
--- a/
src/object/gameobjs.h
+++ b/
src/object/gameobjs.h
@@
-45,7
+45,7
@@
public:
private:
Sprite* sprite;
Vector position;
private:
Sprite* sprite;
Vector position;
- Timer
2
timer;
+ Timer timer;
};
class BrokenBrick : public GameObject
};
class BrokenBrick : public GameObject
@@
-58,7
+58,7
@@
public:
virtual void draw(DrawingContext& context);
private:
virtual void draw(DrawingContext& context);
private:
- Timer
2
timer;
+ Timer timer;
Sprite* sprite;
Vector position;
Vector movement;
Sprite* sprite;
Vector position;
Vector movement;
@@
-76,7
+76,7
@@
public:
private:
Vector position;
std::string text;
private:
Vector position;
std::string text;
- Timer
2
timer;
+ Timer timer;
};
extern Sprite *img_smoke_cloud;
};
extern Sprite *img_smoke_cloud;
@@
-90,7
+90,7
@@
public:
virtual void draw(DrawingContext& context);
private:
virtual void draw(DrawingContext& context);
private:
- Timer
2
timer;
+ Timer timer;
Vector position;
};
Vector position;
};
@@
-107,7
+107,7
@@
public:
private:
Vector accel;
private:
Vector accel;
- Timer
2
timer;
+ Timer timer;
bool live_forever;
Color color;
bool live_forever;
Color color;