fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/object/sprite_particle.cpp b/src/object/sprite_particle.cpp
index 9faab9d..18d7b88 100644 (file)
--- a/src/object/sprite_particle.cpp
+++ b/src/object/sprite_particle.cpp
@@ -1,4 +1,4 @@
-//  $Id: rainsplash.cpp 3327 2006-04-13 15:02:40Z ravu_al_hemio $
+//  $Id$
 //
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
@@ -25,17 +25,18 @@
 #include "main.hpp"
 #include "log.hpp"
 
-SpriteParticle::SpriteParticle(std::string sprite_name, Vector position, AnchorPoint anchor, Vector velocity, Vector acceleration, int drawing_layer) 
+SpriteParticle::SpriteParticle(std::string sprite_name, std::string action, Vector position, AnchorPoint anchor, Vector velocity, Vector acceleration, int drawing_layer)
        : position(position), velocity(velocity), acceleration(acceleration), drawing_layer(drawing_layer)
 {
   sprite = sprite_manager->create(sprite_name);
   if (!sprite) throw std::runtime_error("Could not load sprite "+sprite_name);
-  sprite->set_animation_loops(1);
+  sprite->set_action(action, 1);
+  sprite->set_animation_loops(1); //TODO: this is necessary because set_action will not set "loops" when "action" is the default action
 
   this->position -= get_anchor_pos(sprite->get_current_hitbox(), anchor);
 }
-  
-SpriteParticle::~SpriteParticle() 
+
+SpriteParticle::~SpriteParticle()
 {
   remove_me();
 }
@@ -46,7 +47,7 @@ SpriteParticle::hit(Player& )
 }
 
 void
-SpriteParticle::update(float elapsed_time) 
+SpriteParticle::update(float elapsed_time)
 {
   // die when animation is complete
   if (sprite->animation_done()) {
@@ -62,7 +63,7 @@ SpriteParticle::update(float elapsed_time)
 
   // die when too far offscreen
   Vector camera = Sector::current()->camera->get_translation();
-  if ((position.x < camera.x - 128) || (position.x > SCREEN_WIDTH + camera.x + 128) || 
+  if ((position.x < camera.x - 128) || (position.x > SCREEN_WIDTH + camera.x + 128) ||
       (position.y < camera.y - 128) || (position.y > SCREEN_HEIGHT + camera.y + 128)) {
     remove_me();
     return;
@@ -70,7 +71,7 @@ SpriteParticle::update(float elapsed_time)
 }
 
 void
-SpriteParticle::draw(DrawingContext& context) 
+SpriteParticle::draw(DrawingContext& context)
 {
    sprite->draw(context, position, drawing_layer);
 }