X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite_manager.hpp;h=070a29420aa441e91791d4805e64006103eea2e4;hb=HEAD;hp=48dca27831c09322ca3907ba88323c2f1d54456e;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/sprite/sprite_manager.hpp b/src/sprite/sprite_manager.hpp
index 48dca2783..070a29420 100644
--- a/src/sprite/sprite_manager.hpp
+++ b/src/sprite/sprite_manager.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,32 +12,37 @@
 //  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 SUPERTUX_SPRITE_MANAGER_H
-#define SUPERTUX_SPRITE_MANAGER_H
+#ifndef HEADER_SUPERTUX_SPRITE_SPRITE_MANAGER_HPP
+#define HEADER_SUPERTUX_SPRITE_SPRITE_MANAGER_HPP
 
 #include <map>
+#include <memory>
+#include <string>
+
+#include "sprite/sprite_ptr.hpp"
+#include "util/currenton.hpp"
 
 class SpriteData;
-class Sprite;
 
-class SpriteManager
+class SpriteManager : public Currenton<SpriteManager>
 {
 private:
   typedef std::map<std::string, SpriteData*> Sprites;
   Sprites sprites;
-  
+
 public:
   SpriteManager();
   ~SpriteManager();
 
   /** loads a sprite. */
-  Sprite* create(const std::string& filename);
+  SpritePtr create(const std::string& filename);
 
 private:
   SpriteData* load(const std::string& filename);
 };
 
 #endif
+
+/* EOF */