Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/scripting/floating_image.hpp b/src/scripting/floating_image.hpp
index 42dcf36..ba6f4a9 100644 (file)
--- a/src/scripting/floating_image.hpp
+++ b/src/scripting/floating_image.hpp
@@ -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,22 +12,21 @@
 //  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/>.
 
-#ifndef __FLOATING_IMAGE_HPP__
-#define __FLOATING_IMAGE_HPP__
+#ifndef HEADER_SUPERTUX_SCRIPTING_FLOATING_IMAGE_HPP
+#define HEADER_SUPERTUX_SCRIPTING_FLOATING_IMAGE_HPP
 
 #ifndef SCRIPTING_API
-#define __suspend
-#include <string>
+#define HEADER_SUPERTUX_SCRIPTING_FLOATING_IMAGE_HPP
+
+#include "util/ref.hpp"
 
 class FloatingImage;
 typedef FloatingImage _FloatingImage;
 #endif
 
-namespace Scripting
-{
+namespace Scripting {
 
 class FloatingImage
 {
@@ -46,10 +43,14 @@ public:
   int get_anchor_point();
   void set_visible(bool visible);
   bool get_visible();
-  
+  void set_action(const std::string& action);
+  std::string get_action();
+  void fade_in(float fadetime);
+  void fade_out(float fadetime);
+
 #ifndef SCRIPTING_API
 private:
-  _FloatingImage* floating_image;
+  Ref<_FloatingImage> floating_image;
 #endif
 };
 
@@ -57,3 +58,4 @@ private:
 
 #endif
 
+/* EOF */