Fix music not properly fading in again

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

diff --git a/src/object/floating_image.cpp b/src/object/floating_image.cpp
index 0d41354..1bb0fe2 100644 (file)
--- a/src/object/floating_image.cpp
+++ b/src/object/floating_image.cpp
@@ -20,15 +20,14 @@
 #include "supertux/globals.hpp"
 
 FloatingImage::FloatingImage(const std::string& spritefile) :
-  sprite(),
-  layer(LAYER_FOREGROUND1 + 1), 
-  visible(false), 
-  anchor(ANCHOR_MIDDLE), 
+  sprite(SpriteManager::current()->create(spritefile)),
+  layer(LAYER_FOREGROUND1 + 1),
+  visible(false),
+  anchor(ANCHOR_MIDDLE),
   pos(),
-  fading(0), 
+  fading(0),
   fadetime(0)
 {
-  sprite = sprite_manager->create(spritefile);
 }
 
 FloatingImage::~FloatingImage()
@@ -68,17 +67,17 @@ FloatingImage::get_action()
 }
 
 void
-FloatingImage::fade_in(float fadetime)
+FloatingImage::fade_in(float fadetime_)
 {
-  this->fadetime = fadetime;
-  fading = fadetime;
+  this->fadetime = fadetime_;
+  fading = fadetime_;
 }
 
 void
-FloatingImage::fade_out(float fadetime)
+FloatingImage::fade_out(float fadetime_)
 {
-  this->fadetime = fadetime;
-  fading = -fadetime;
+  this->fadetime = fadetime_;
+  fading = -fadetime_;
 }
 
 void