X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject%2Ffloating_image.hpp;h=85a7697fc34d2a3110f6ae1b815c24d3f5870054;hb=f2ffe3ee4a4955232ac311c661f98e11d2daa155;hp=0c827faf5967356d2007bffb8179c995743fefdb;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/floating_image.hpp b/src/object/floating_image.hpp
index 0c827faf5..85a7697fc 100644
--- a/src/object/floating_image.hpp
+++ b/src/object/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,16 +12,14 @@
 //  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_H__
-#define __FLOATING_IMAGE_H__
+#ifndef HEADER_SUPERTUX_OBJECT_FLOATING_IMAGE_HPP
+#define HEADER_SUPERTUX_OBJECT_FLOATING_IMAGE_HPP
 
-#include "game_object.hpp"
-#include "math/vector.hpp"
-#include "anchor_point.hpp"
-#include <memory>
+#include "object/anchor_point.hpp"
+#include "sprite/sprite_ptr.hpp"
+#include "supertux/game_object.hpp"
 
 class Sprite;
 
@@ -36,7 +32,7 @@ public:
   void set_layer(int layer) {
     this->layer = layer;
   }
-  
+
   int get_layer() const {
     return layer;
   }
@@ -47,7 +43,7 @@ public:
   const Vector& get_pos() const {
     return pos;
   }
-  
+
   void set_anchor_point(AnchorPoint anchor) {
     this->anchor = anchor;
   }
@@ -62,16 +58,25 @@ public:
     return visible;
   }
 
+  void set_action(const std::string& action);
+  std::string get_action();
+
+  void fade_in(float fadetime);
+  void fade_out(float fadetime);
+
   void update(float elapsed_time);
   void draw(DrawingContext& context);
 
 private:
-  std::auto_ptr<Sprite> sprite;
+  SpritePtr sprite;
   int layer;
   bool visible;
   AnchorPoint anchor;
   Vector pos;
+  float fading;
+  float fadetime;
 };
 
 #endif
 
+/* EOF */