Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

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

diff --git a/src/object/floating_image.hpp b/src/object/floating_image.hpp
index 7e7ddc3..19797db 100644 (file)
--- a/src/object/floating_image.hpp
+++ b/src/object/floating_image.hpp
@@ -36,7 +36,7 @@ public:
   void set_layer(int layer) {
     this->layer = layer;
   }
-  
+
   int get_layer() const {
     return layer;
   }
@@ -47,7 +47,7 @@ public:
   const Vector& get_pos() const {
     return pos;
   }
-  
+
   void set_anchor_point(AnchorPoint anchor) {
     this->anchor = anchor;
   }
@@ -65,6 +65,9 @@ public:
   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);
 
@@ -74,7 +77,8 @@ private:
   bool visible;
   AnchorPoint anchor;
   Vector pos;
+  float fading;
+  float fadetime;
 };
 
 #endif
-