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

[supertux.git] / src / sprite / sprite_manager.hpp

diff --git a/src/sprite/sprite_manager.hpp b/src/sprite/sprite_manager.hpp
index dcdcbf9..d6f5a88 100644 (file)
--- a/src/sprite/sprite_manager.hpp
+++ b/src/sprite/sprite_manager.hpp
@@ -1,43 +1,48 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  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
 //  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.
+//  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.hpp"
+class SpriteData;
+class Sprite;
 
 class SpriteManager
 {
 private:
-       typedef std::map<std::string, SpriteData*> Sprites;
-       Sprites sprites;
+  typedef std::map<std::string, SpriteData*> Sprites;
+  Sprites sprites;
+
 public:
-       SpriteManager(const std::string& filename);
-       ~SpriteManager();
-
-       void load_resfile(const std::string& filename);
-       /** loads a sprite.
-        * (contrary to the old api you have to delete the sprite!)
-        */
-       Sprite* create(const std::string& name);
+  SpriteManager();
+  ~SpriteManager();
+
+  /** loads a sprite. */
+  std::auto_ptr<Sprite> create(const std::string& filename);
+
+private:
+  SpriteData* load(const std::string& filename);
 };
 
+extern SpriteManager* sprite_manager;
+
 #endif
+
+/* EOF */