X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ffalling_coin.hpp;h=3b614c8b63bad57a9c3de863545be7378f75f1aa;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=8eeabb39590fc2db46693bedabe296de59ff61f2;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git diff --git a/src/object/falling_coin.hpp b/src/object/falling_coin.hpp index 8eeabb395..3b614c8b6 100644 --- a/src/object/falling_coin.hpp +++ b/src/object/falling_coin.hpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Ondrej Hosek // -// 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 @@ -14,19 +12,16 @@ // 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 . -#ifndef __FALLING_COIN_H__ -#define __FALLING_COIN_H__ +#ifndef HEADER_SUPERTUX_OBJECT_FALLING_COIN_HPP +#define HEADER_SUPERTUX_OBJECT_FALLING_COIN_HPP -#include "game_object.hpp" -#include "math/vector.hpp" #include "sprite/sprite.hpp" -#include "video/drawing_context.hpp" -#include "physic.hpp" +#include "supertux/game_object.hpp" +#include "supertux/physic.hpp" -class FallingCoin : public GameObject, private UsesPhysic +class FallingCoin : public GameObject { public: FallingCoin(const Vector& start_position, const int x_vel); @@ -34,9 +29,13 @@ public: void draw(DrawingContext& context); void update(float elapsed_time); + private: - Vector pos; - Sprite* sprite; + Physic physic; + Vector pos; + std::auto_ptr sprite; }; #endif + +/* EOF */