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

[supertux.git] / src / object / star.cpp

diff --git a/src/object/star.cpp b/src/object/star.cpp
index 0af8d6f..773be33 100644 (file)
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -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,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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "star.hpp"
-#include "resources.hpp"
-#include "player.hpp"
-#include "player_status.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "video/drawing_context.hpp"
+#include "object/player.hpp"
+#include "object/star.hpp"
 
 static const float INITIALJUMP = -400;
 static const float SPEED = 150;
 static const float JUMPSPEED = -300;
 
 Star::Star(const Vector& pos, Direction direction)
-        : MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
+  : MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
   physic.set_velocity((direction == LEFT) ? -SPEED : SPEED, INITIALJUMP);
 }
@@ -66,3 +57,5 @@ Star::collision(GameObject& other, const CollisionHit& )
 
   return FORCE_MOVE;
 }
+
+/* EOF */