Fix for coverity #29401

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

diff --git a/src/object/floating_image.hpp b/src/object/floating_image.hpp
index 897e879..eb8c6e1 100644 (file)
--- 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;
 
@@ -33,30 +29,30 @@ public:
   FloatingImage(const std::string& sprite);
   virtual ~FloatingImage();
 
-  void set_layer(int layer) {
-    this->layer = layer;
+  void set_layer(int layer_) {
+    this->layer = layer_;
   }
 
   int get_layer() const {
     return layer;
   }
 
-  void set_pos(const Vector& pos) {
-    this->pos = pos;
+  void set_pos(const Vector& pos_) {
+    this->pos = pos_;
   }
   const Vector& get_pos() const {
     return pos;
   }
 
-  void set_anchor_point(AnchorPoint anchor) {
-    this->anchor = anchor;
+  void set_anchor_point(AnchorPoint anchor_) {
+    this->anchor = anchor_;
   }
   AnchorPoint get_anchor_point() const {
     return anchor;
   }
 
-  void set_visible(bool visible) {
-    this->visible = visible;
+  void set_visible(bool visible_) {
+    this->visible = visible_;
   }
   bool get_visible() const {
     return visible;
@@ -64,7 +60,7 @@ public:
 
   void set_action(const std::string& action);
   std::string get_action();
-  
+
   void fade_in(float fadetime);
   void fade_out(float fadetime);
 
@@ -72,7 +68,7 @@ public:
   void draw(DrawingContext& context);
 
 private:
-  std::auto_ptr<Sprite> sprite;
+  SpritePtr sprite;
   int layer;
   bool visible;
   AnchorPoint anchor;
@@ -82,3 +78,5 @@ private:
 };
 
 #endif
+
+/* EOF */