X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgameobjs.h;h=69b0f260b1ea157714aeaba194d1d9a53a2c2d7c;hb=ddc3b7ef2077567d368e244a292b41187311e8e3;hp=81a336a15eb3e2b36dc8a3a984a82495f7a243f7;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git diff --git a/src/object/gameobjs.h b/src/object/gameobjs.h index 81a336a15..69b0f260b 100644 --- a/src/object/gameobjs.h +++ b/src/object/gameobjs.h @@ -45,7 +45,7 @@ public: private: Sprite* sprite; Vector position; - Timer2 timer; + Timer timer; }; class BrokenBrick : public GameObject @@ -58,7 +58,7 @@ public: virtual void draw(DrawingContext& context); private: - Timer2 timer; + Timer timer; Sprite* sprite; Vector position; Vector movement; @@ -76,7 +76,7 @@ public: private: Vector position; std::string text; - Timer2 timer; + Timer timer; }; extern Sprite *img_smoke_cloud; @@ -90,7 +90,7 @@ public: virtual void draw(DrawingContext& context); private: - Timer2 timer; + Timer timer; Vector position; }; @@ -107,7 +107,7 @@ public: private: Vector accel; - Timer2 timer; + Timer timer; bool live_forever; Color color;