X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite_data.hpp;h=bc5ccb3406a9fd9801d53c99b9a434c39dab5e28;hb=3b98af33dfb3ea9f683a89d35a02206d18cb0494;hp=3850141dd132b1ec87ee9b539466bb40edd0e226;hpb=efc61e9d05b077f13a76982590fb0bd6a9d8dc61;p=supertux.git

diff --git a/src/sprite/sprite_data.hpp b/src/sprite/sprite_data.hpp
index 3850141dd..bc5ccb340 100644
--- a/src/sprite/sprite_data.hpp
+++ b/src/sprite/sprite_data.hpp
@@ -1,8 +1,7 @@
 //  $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
@@ -13,10 +12,11 @@
 //  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
 
@@ -30,47 +30,52 @@
 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 lisp::Lisp* 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();
 
-	struct Action
-	{
-	  Action();
-	  ~Action();
-	  
-	  std::string name;
+    std::string name;
 
-	  /** Position correction */
-	  int x_offset;
-	  int y_offset;
-	  /** Drawing priority in queue */
-	  int z_order;
+    /** Position correction */
+    float x_offset;
+    float y_offset;
 
-	  /** Frames per second */
-	  float fps;
+    /** Hitbox width */
+    float hitbox_w;
 
-	  std::vector<Surface*> surfaces;
-	};
+    /** Hitbox height */
+    float hitbox_h;
 
-	typedef std::map <std::string, Action*> Actions;
-	Actions actions;
+    /** Drawing priority in queue */
+    int z_order;
 
-	void parse_action(const lisp::Lisp* lispreader);
-	/** Get an action */
-	Action* get_action(std::string act);
+    /** Frames per second */
+    float fps;
 
-	std::string name;
+    std::vector<Surface*> surfaces;
+  };
+
+  typedef std::map <std::string, Action*> Actions;
+  Actions actions;
+
+  void parse_action(const lisp::Lisp* lispreader, const std::string& basedir);
+  /** Get an action */
+  Action* get_action(std::string act);
+
+  std::string name;
 };
 
 #endif
-