fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/object/star.cpp b/src/object/star.cpp
index a504e40..316f572 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>
 
@@ -27,21 +26,14 @@
 #include "sprite/sprite_manager.hpp"
 #include "video/drawing_context.hpp"
 
-static const float INITIALJUMP = 400;
+static const float INITIALJUMP = -400;
 static const float SPEED = 150;
-static const float JUMPSPEED = 300;
-
-Star::Star(const Vector& pos)
-{
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("star");
-  physic.set_velocity(SPEED, INITIALJUMP);
-}
+static const float JUMPSPEED = -300;
 
-Star::~Star()
+Star::Star(const Vector& pos, Direction direction)
+       : MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  delete sprite;
+  physic.set_velocity((direction == LEFT) ? -SPEED : SPEED, INITIALJUMP);
 }
 
 void
@@ -51,26 +43,20 @@ Star::update(float elapsed_time)
 }
 
 void
-Star::draw(DrawingContext& context)
+Star::collision_solid(const CollisionHit& hit)
 {
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  if(hit.bottom) {
+    physic.set_velocity_y(JUMPSPEED);
+  } else if(hit.top) {
+    physic.set_velocity_y(0);
+  } else if(hit.left || hit.right) {
+    physic.set_velocity_x(-physic.get_velocity_x());
+  }
 }
 
 HitResponse
-Star::collision(GameObject& other, const CollisionHit& hit)
+Star::collision(GameObject& other, const CollisionHit& )
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(hit.normal.y < -.5) { // ground
-      physic.set_velocity_y(JUMPSPEED);
-    } else if(hit.normal.y > .5) { // roof
-      physic.set_velocity_y(0);
-    } else { // bumped left or right
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
-
-    return CONTINUE;
-  }
-  
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
     player->make_invincible();
@@ -80,4 +66,3 @@ Star::collision(GameObject& other, const CollisionHit& hit)
 
   return FORCE_MOVE;
 }
-