More use of SurfacePtr

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

diff --git a/src/sprite/sprite_data.hpp b/src/sprite/sprite_data.hpp
index 3850141..d5e3a86 100644 (file)
--- a/src/sprite/sprite_data.hpp
+++ b/src/sprite/sprite_data.hpp
@@ -1,76 +1,79 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>,
-//            (C) 2004 Matthias Braun <matze@braunis.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.
-#ifndef SUPERTUX_SPRITE_DATA_H
-#define SUPERTUX_SPRITE_DATA_H
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_SPRITE_SPRITE_DATA_HPP
+#define HEADER_SUPERTUX_SPRITE_SPRITE_DATA_HPP
 
-#include <string>
-#include <vector>
 #include <map>
+#include <vector>
 
-#include "lisp/lisp.hpp"
+#include "util/reader_fwd.hpp"
 #include "video/surface.hpp"
 
 class SpriteData
 {
 public:
-       /** cur has to be a pointer to data in the form of ((x-offset 5)
-         (y-offset 10) ...) */
-       SpriteData(const lisp::Lisp* cur);                                         
-       ~SpriteData();
+  /** cur has to be a pointer to data in the form of ((hitbox 5 10 0 0) ...) */
+  SpriteData(const Reader& cur, const std::string& basedir);
+  ~SpriteData();
 
-       const std::string& get_name() const
-       {
-         return name;
-       }
+  const std::string& get_name() const
+  {
+    return name;
+  }
 
 private:
-       friend class Sprite;
+  friend class Sprite;
+
+  struct Action
+  {
+    Action();
+    ~Action();
+
+    std::string name;
+
+    /** Position correction */
+    float x_offset;
+    float y_offset;
+
+    /** Hitbox width */
+    float hitbox_w;
 
-       struct Action
-       {
-         Action();
-         ~Action();
-         
-         std::string name;
+    /** Hitbox height */
+    float hitbox_h;
 
-         /** Position correction */
-         int x_offset;
-         int y_offset;
-         /** Drawing priority in queue */
-         int z_order;
+    /** Drawing priority in queue */
+    int z_order;
 
-         /** Frames per second */
-         float fps;
+    /** Frames per second */
+    float fps;
 
-         std::vector<Surface*> surfaces;
-       };
+    std::vector<SurfacePtr> surfaces;
+  };
 
-       typedef std::map <std::string, Action*> Actions;
-       Actions actions;
+  typedef std::map <std::string, Action*> Actions;
 
-       void parse_action(const lisp::Lisp* lispreader);
-       /** Get an action */
-       Action* get_action(std::string act);
+  void parse_action(const Reader& lispreader, const std::string& basedir);
+  /** Get an action */
+  Action* get_action(std::string act);
 
-       std::string name;
+  Actions actions;
+  std::string name;
 };
 
 #endif
 
+/* EOF */