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 917f3f1..19797db 100644 (file)
--- a/src/object/floating_image.hpp
+++ b/src/object/floating_image.hpp
@@ -1,9 +1,29 @@
+//  $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 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, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __FLOATING_IMAGE_H__
 #define __FLOATING_IMAGE_H__
 
 #include "game_object.hpp"
 #include "math/vector.hpp"
 #include "anchor_point.hpp"
+#include <memory>
 
 class Sprite;
 
@@ -16,7 +36,7 @@ public:
   void set_layer(int layer) {
     this->layer = layer;
   }
-  
+
   int get_layer() const {
     return layer;
   }
@@ -27,7 +47,7 @@ public:
   const Vector& get_pos() const {
     return pos;
   }
-  
+
   void set_anchor_point(AnchorPoint anchor) {
     this->anchor = anchor;
   }
@@ -42,16 +62,23 @@ 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
-