X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fscripting%2Ffloating_image.cpp;h=77fe80bcbd2580ecd9d604642b19bebd7fcf8ab7;hb=1dfea219eaf49fc5756f28cfca5430847e3a3179;hp=5f323c2dc562eb14432430e4255d026a34db1690;hpb=f81231933de4e2f826bd12a1433e1cef9a7fd71b;p=supertux.git

diff --git a/src/scripting/floating_image.cpp b/src/scripting/floating_image.cpp
index 5f323c2dc..77fe80bcb 100644
--- a/src/scripting/floating_image.cpp
+++ b/src/scripting/floating_image.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,32 +12,27 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <assert.h>
 #include <stdexcept>
-#include "floating_image.hpp"
-#include "sector.hpp"
+
 #include "object/floating_image.hpp"
+#include "scripting/floating_image.hpp"
+#include "supertux/sector.hpp"
 #include "worldmap/worldmap.hpp"
 
-namespace Scripting
-{
+namespace scripting {
 
-FloatingImage::FloatingImage(const std::string& spritefile)
+FloatingImage::FloatingImage(const std::string& spritefile) :
+  floating_image(std::make_shared<_FloatingImage>(spritefile))
 {
-  using namespace WorldMapNS;
-  
-  floating_image = new _FloatingImage(spritefile); 
+  using namespace worldmap;
+
   if(Sector::current() != NULL) {
     Sector::current()->add_object(floating_image);
   } else if(WorldMap::current() != NULL) {
     WorldMap::current()->add_object(floating_image);
   } else {
-    delete floating_image;
     throw new std::runtime_error("Neither sector nor worldmap active");
   }
 }
@@ -47,7 +40,6 @@ FloatingImage::FloatingImage(const std::string& spritefile)
 FloatingImage::~FloatingImage()
 {
   floating_image->remove_me();
-  // no delete here, Sector will do that
 }
 
 void
@@ -116,4 +108,18 @@ FloatingImage::get_action()
   return floating_image->get_action();
 }
 
+void
+FloatingImage::fade_in(float fadetime)
+{
+  floating_image->fade_in(fadetime);
+}
+
+void
+FloatingImage::fade_out(float fadetime)
+{
+  floating_image->fade_out(fadetime);
 }
+
+}
+
+/* EOF */