stopped infoblocks from ringing, since they're not telephones anymore - code is only...

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

diff --git a/src/object/star.cpp b/src/object/star.cpp
index 522c08a..f02a7ea 100644 (file)
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -1,11 +1,30 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 distributed in the hope that it will be useful,
+//  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.
 #include <config.h>
 
-#include "star.h"
-#include "resources.h"
-#include "player.h"
-#include "scene.h"
-#include "special/sprite_manager.h"
-#include "video/drawing_context.h"
+#include "star.hpp"
+#include "resources.hpp"
+#include "player.hpp"
+#include "player_status.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "video/drawing_context.hpp"
 
 static const float INITIALJUMP = 400;
 static const float SPEED = 150;
@@ -15,8 +34,10 @@ Star::Star(const Vector& pos)
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
-  sprite = sprite_manager->create("star");
+  sprite = sprite_manager->create("images/powerups/star/star.sprite");
   physic.set_velocity(SPEED, INITIALJUMP);
+
+  set_group(COLGROUP_MOVING);
 }
 
 Star::~Star()
@@ -25,7 +46,7 @@ Star::~Star()
 }
 
 void
-Star::action(float elapsed_time)
+Star::update(float elapsed_time)
 {
   movement = physic.get_movement(elapsed_time);
 }