X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Foneup.hpp;h=93da9a1251719b0e614460c64a6c92e29cacd386;hb=78ac7aef674f518549f96160c6354b589553f952;hp=1e23841246f2e8246b27cdcf405a88a026180ead;hpb=4587bd9c8fc5cbb20f1e442de76bc06571ab56ba;p=supertux.git

diff --git a/src/object/oneup.hpp b/src/object/oneup.hpp
index 1e2384124..93da9a125 100644
--- a/src/object/oneup.hpp
+++ b/src/object/oneup.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  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,24 +12,27 @@
 //  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 <http://www.gnu.org/licenses/>.
 
-#ifndef __ONEUP_H__
-#define __ONEUP_H__
+#ifndef HEADER_SUPERTUX_OBJECT_ONEUP_HPP
+#define HEADER_SUPERTUX_OBJECT_ONEUP_HPP
 
 #include "object/moving_sprite.hpp"
-#include "physic.hpp"
-#include "direction.hpp"
+#include "supertux/direction.hpp"
+#include "supertux/physic.hpp"
 
-class OneUp : public MovingSprite, private UsesPhysic
+class OneUp : public MovingSprite
 {
 public:
   OneUp(const Vector& pos, Direction direction = RIGHT);
-  virtual OneUp* clone() const { return new OneUp(*this); }
 
   virtual void update(float elapsed_time);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
+
+private:
+  Physic physic;
 };
 
 #endif
+
+/* EOF */