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

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

diff --git a/src/object/rainsplash.hpp b/src/object/rainsplash.hpp
index 61e438f..5baa1aa 100644 (file)
--- a/src/object/rainsplash.hpp
+++ b/src/object/rainsplash.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,19 +12,16 @@
 //  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 __RAINSPLASH_H__
-#define __RAINSPLASH_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifndef HEADER_SUPERTUX_OBJECT_RAINSPLASH_HPP
+#define HEADER_SUPERTUX_OBJECT_RAINSPLASH_HPP
 
-#include "game_object.hpp"
-#include "resources.hpp"
-#include "player.hpp"
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
-#include "video/drawing_context.hpp"
+#include "supertux/game_object.hpp"
+
+class Player;
 
 class RainSplash : public GameObject
 {
@@ -38,9 +33,11 @@ protected:
   virtual void update(float time);
   virtual void draw(DrawingContext& context);
 private:
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
   Vector position;
   int frame;
 };
 
 #endif
+
+/* EOF */