X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fsprite_particle.cpp;h=18777da2f4846313ad0085298297f40149ef2d1c;hb=64842a0700a2ee8a3d2d61ad2685217f5060985a;hp=0f72a6b57ff658d59e2ddcb625f8eeccdae44156;hpb=b4ffa23e2beb6d10f8f5f2fccd4b41fb3e344759;p=supertux.git

diff --git a/src/object/sprite_particle.cpp b/src/object/sprite_particle.cpp
index 0f72a6b57..18777da2f 100644
--- a/src/object/sprite_particle.cpp
+++ b/src/object/sprite_particle.cpp
@@ -25,30 +25,31 @@
 #include <stdexcept>
 
 SpriteParticle::SpriteParticle(std::string sprite_name, std::string action,
-                               Vector position, AnchorPoint anchor, Vector velocity, Vector acceleration,
-                               int drawing_layer) :
+                               Vector position_, AnchorPoint anchor, Vector velocity_, Vector acceleration_,
+                               int drawing_layer_) :
   sprite(),
-  position(position),
-  velocity(velocity),
-  acceleration(acceleration),
-  drawing_layer(drawing_layer),
+  position(position_),
+  velocity(velocity_),
+  acceleration(acceleration_),
+  drawing_layer(drawing_layer_),
   light(0.0f,0.0f,0.0f),
-  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-tiny.sprite")),
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-tiny.sprite")),
   glow(false)
 {
-  sprite = sprite_manager->create(sprite_name);
+  sprite = SpriteManager::current()->create(sprite_name);
   if (!sprite.get()) throw std::runtime_error("Could not load sprite "+sprite_name);
   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);
 
-  if(sprite_name=="images/objects/particles/sparkle.sprite")
+  if(sprite_name=="images/objects/particles/sparkle.sprite") {
     glow = true;
     if(action=="dark") {
       lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
       lightsprite->set_color(Color(0.1f, 0.1f, 0.1f));
     }
+  }
 }
 
 SpriteParticle::~SpriteParticle()