Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / bullet.hpp

diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp
index c3464d7..ca90159 100644 (file)
--- a/src/object/bullet.hpp
+++ b/src/object/bullet.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,18 +12,17 @@
 //  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 __BULLET_H__
-#define __BULLET_H__
+#ifndef HEADER_SUPERTUX_OBJECT_BULLET_HPP
+#define HEADER_SUPERTUX_OBJECT_BULLET_HPP
 
-#include "moving_object.hpp"
-#include "physic.hpp"
 #include "sprite/sprite.hpp"
-#include "player_status.hpp"
+#include "supertux/moving_object.hpp"
+#include "supertux/physic.hpp"
+#include "supertux/player_status.hpp"
 
-class Bullet : public MovingObject, private UsesPhysic
+class Bullet : public MovingObject
 {
 public:
   Bullet(const Vector& pos, float xm, int dir, BonusType type);
@@ -49,9 +46,12 @@ public:
   }
 
 private:
+  Physic physic;
   int life_count;
   std::auto_ptr<Sprite> sprite;
   BonusType type;
 };
 
 #endif
+
+/* EOF */