some comments about collision detection

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

diff --git a/src/object/star.cpp b/src/object/star.cpp
index a504e40..39724b8 100644 (file)
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,11 +12,10 @@
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
@@ -32,30 +31,17 @@ static const float SPEED = 150;
 static const float JUMPSPEED = 300;
 
 Star::Star(const Vector& pos)
+       : MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("star");
   physic.set_velocity(SPEED, INITIALJUMP);
 }
 
-Star::~Star()
-{
-  delete sprite;
-}
-
 void
 Star::update(float elapsed_time)
 {
   movement = physic.get_movement(elapsed_time);
 }
 
-void
-Star::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-
 HitResponse
 Star::collision(GameObject& other, const CollisionHit& hit)
 {