X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ffloating_image.hpp;h=40b7d4c7b390e1fbd351a05e63f2db048bf5df95;hb=78ac7aef674f518549f96160c6354b589553f952;hp=917f3f16ce592fb6be5b11b65328b938d16707fc;hpb=fc9a5c880b865b20af63d5fadc6373f7bd1d2e7e;p=supertux.git

diff --git a/src/object/floating_image.hpp b/src/object/floating_image.hpp
index 917f3f16c..40b7d4c7b 100644
--- a/src/object/floating_image.hpp
+++ b/src/object/floating_image.hpp
@@ -1,9 +1,25 @@
-#ifndef __FLOATING_IMAGE_H__
-#define __FLOATING_IMAGE_H__
+//  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 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
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  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, see <http://www.gnu.org/licenses/>.
 
-#include "game_object.hpp"
-#include "math/vector.hpp"
-#include "anchor_point.hpp"
+#ifndef HEADER_SUPERTUX_OBJECT_FLOATING_IMAGE_HPP
+#define HEADER_SUPERTUX_OBJECT_FLOATING_IMAGE_HPP
+
+#include "object/anchor_point.hpp"
+#include "supertux/game_object.hpp"
+#include <memory>
 
 class Sprite;
 
@@ -16,7 +32,7 @@ public:
   void set_layer(int layer) {
     this->layer = layer;
   }
-  
+
   int get_layer() const {
     return layer;
   }
@@ -27,7 +43,7 @@ public:
   const Vector& get_pos() const {
     return pos;
   }
-  
+
   void set_anchor_point(AnchorPoint anchor) {
     this->anchor = anchor;
   }
@@ -42,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:
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
   int layer;
   bool visible;
   AnchorPoint anchor;
   Vector pos;
+  float fading;
+  float fadetime;
 };
 
 #endif
 
+/* EOF */