Replaced Ref and RefCounter with std::shared_ptr<>

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

diff --git a/src/scripting/floating_image.cpp b/src/scripting/floating_image.cpp
index 8b09e64..2264d0d 100644 (file)
--- 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,30 +12,35 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include <stdexcept>
 
-#include <assert.h>
-#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()
 {
-  assert(Sector::current() != NULL);
-  floating_image = new _FloatingImage(spritefile); 
-  Sector::current()->add_object(floating_image);
+  using namespace worldmap;
+
+  floating_image = std::make_shared<_FloatingImage>(spritefile);
+  if(Sector::current() != NULL) {
+    Sector::current()->add_object(floating_image);
+  } else if(WorldMap::current() != NULL) {
+    WorldMap::current()->add_object(floating_image);
+  } else {
+    throw new std::runtime_error("Neither sector nor worldmap active");
+  }
 }
 
 FloatingImage::~FloatingImage()
 {
   floating_image->remove_me();
-  // no delete here, Sector will do that
 }
 
 void
@@ -106,4 +109,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 */