X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite_data.hpp;h=bc5ccb3406a9fd9801d53c99b9a434c39dab5e28;hb=3b98af33dfb3ea9f683a89d35a02206d18cb0494;hp=9b90338462185e4f034869fd8d55ff4f38334731;hpb=85a02e771388b133940b45e29768e697a29c1a36;p=supertux.git diff --git a/src/sprite/sprite_data.hpp b/src/sprite/sprite_data.hpp index 9b9033846..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 , -// (C) 2004 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // 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,8 +30,7 @@ class SpriteData { public: - /** cur has to be a pointer to data in the form of ((x-offset 5) - (y-offset 10) ...) */ + /** 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(); @@ -51,8 +50,15 @@ private: std::string name; /** Position correction */ - int x_offset; - int y_offset; + float x_offset; + float y_offset; + + /** Hitbox width */ + float hitbox_w; + + /** Hitbox height */ + float hitbox_h; + /** Drawing priority in queue */ int z_order; @@ -73,4 +79,3 @@ private: }; #endif -