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

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

diff --git a/src/object/floating_image.cpp b/src/object/floating_image.cpp
index 00782af..d25ad3d 100644 (file)
--- a/src/object/floating_image.cpp
+++ b/src/object/floating_image.cpp
@@ -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,26 +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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <stdexcept>
-#include "resources.hpp"
-#include "main.hpp"
-#include "math/rect.hpp"
-#include "sprite/sprite_manager.hpp"
+#include "object/floating_image.hpp"
 #include "sprite/sprite.hpp"
-#include "video/drawing_context.hpp"
-#include "lisp/lisp.hpp"
-#include "floating_image.hpp"
-
-
-FloatingImage::FloatingImage(const std::string& spritefile)
-  : layer(LAYER_FOREGROUND1 + 1), visible(false), anchor(ANCHOR_MIDDLE), fading(0), fadetime(0)
+#include "sprite/sprite_manager.hpp"
+#include "supertux/main.hpp"
+
+FloatingImage::FloatingImage(const std::string& spritefile) :
+  layer(LAYER_FOREGROUND1 + 1), 
+  visible(false), 
+  anchor(ANCHOR_MIDDLE), 
+  fading(0), 
+  fadetime(0)
 {
-  sprite.reset(sprite_manager->create(spritefile));
+  sprite = sprite_manager->create(spritefile);
 }
 
 FloatingImage::~FloatingImage()
@@ -57,7 +50,7 @@ FloatingImage::update(float elapsed_time)
     }
   }
 
-//  (void) elapsed_time;
+  //  (void) elapsed_time;
 }
 
 void
@@ -86,7 +79,6 @@ FloatingImage::fade_out(float fadetime)
   fading = -fadetime;
 }
 
-
 void
 FloatingImage::draw(DrawingContext& context)
 {
@@ -103,9 +95,11 @@ FloatingImage::draw(DrawingContext& context)
   }
 
   Vector spos = pos + get_anchor_pos(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
-      sprite->get_width(), sprite->get_height(), anchor);
+                                     sprite->get_width(), sprite->get_height(), anchor);
 
   sprite->draw(context, spos, layer);
 
   context.pop_transform();
 }
+
+/* EOF */