fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/object/oneup.cpp b/src/object/oneup.cpp
index d129653..bdbaa5e 100644 (file)
--- a/src/object/oneup.cpp
+++ b/src/object/oneup.cpp
@@ -24,21 +24,12 @@
 #include "player.hpp"
 #include "player_status.hpp"
 #include "sector.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "video/drawing_context.hpp"
 
-OneUp::OneUp(const Vector& pos)
+OneUp::OneUp(const Vector& pos, Direction direction)
+       : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("images/powerups/1up/1up.sprite");
-  physic.set_velocity(100, 400);
-  set_group(COLGROUP_TOUCHABLE);
-}
-
-OneUp::~OneUp()
-{
-  delete sprite;
+  physic.set_velocity((direction == LEFT)?-100:100, -400);
 }
 
 void
@@ -47,13 +38,7 @@ OneUp::update(float elapsed_time)
   if(!Sector::current()->inside(bbox))
     remove_me();
 
-  movement = physic.get_movement(elapsed_time); 
-}
-
-void
-OneUp::draw(DrawingContext& context)
-{
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  movement = physic.get_movement(elapsed_time);
 }
 
 HitResponse
@@ -67,4 +52,3 @@ OneUp::collision(GameObject& other, const CollisionHit& )
   }
   return FORCE_MOVE;
 }
-