hopefully fixed the crash on exit, keep sectors script bundled in the sector and...

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

diff --git a/src/object/floating_image.cpp b/src/object/floating_image.cpp
index a1461cf..b8fb087 100644 (file)
--- a/src/object/floating_image.cpp
+++ b/src/object/floating_image.cpp
@@ -11,15 +11,13 @@
 #include "floating_image.hpp"
 
 FloatingImage::FloatingImage(const std::string& spritefile) 
-  : sprite(NULL), layer(LAYER_FOREGROUND1 + 1), visible(false),
-    anchor(ANCHOR_MIDDLE)
+  : layer(LAYER_FOREGROUND1 + 1), visible(false), anchor(ANCHOR_MIDDLE)
 {
-  sprite = sprite_manager->create(spritefile);
+  sprite.reset(sprite_manager->create(spritefile));
 }
 
 FloatingImage::~FloatingImage()
 {
-  delete sprite;
 }
 
 void
@@ -37,10 +35,10 @@ FloatingImage::draw(DrawingContext& context)
   context.push_transform();
   context.set_translation(Vector(0, 0));
 
-  Vector pos = get_anchor_pos(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
+  Vector spos = pos + get_anchor_pos(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
       sprite->get_width(), sprite->get_height(), anchor);
 
-  sprite->draw(context, pos, layer);
+  sprite->draw(context, spos, layer);
 
   context.pop_transform();
 }