X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgameobjs.hpp;h=5a4063f52c498b979dd3fafa5f888cad95d242dc;hb=ed161bf9da56b598f3db3637c6017fa22e9ab0d7;hp=18718e1adbec83f738daf358b0060efda336b5e0;hpb=70fdbd45026801f0f0f312278c69b383eaca9d3a;p=supertux.git diff --git a/src/object/gameobjs.hpp b/src/object/gameobjs.hpp index 18718e1ad..5a4063f52 100644 --- a/src/object/gameobjs.hpp +++ b/src/object/gameobjs.hpp @@ -1,8 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2000 Bill Kendrick -// Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,17 +12,16 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // 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. +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef SUPERTUX_GAMEOBJS_H #define SUPERTUX_GAMEOBJS_H #include "video/surface.hpp" #include "timer.hpp" -#include "physic.hpp" #include "game_object.hpp" #include "moving_object.hpp" #include "serializable.hpp" @@ -70,14 +68,14 @@ class FloatingText : public GameObject public: FloatingText(const Vector& pos, const std::string& text_); FloatingText(const Vector& pos, int s); // use this for score, for instance - + virtual void update(float elapsed_time); virtual void draw(DrawingContext& context); private: Vector position; std::string text; - Timer timer; + Timer timer; }; class SmokeCloud : public GameObject @@ -85,7 +83,7 @@ class SmokeCloud : public GameObject public: SmokeCloud(const Vector& pos); ~SmokeCloud(); - + virtual void update(float elapsed_time); virtual void draw(DrawingContext& context); @@ -95,7 +93,7 @@ private: Vector position; }; -#endif +#endif /* Local Variables: */ /* mode:c++ */