projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore trunk
[supertux.git]
/
src
/
sprite
/
sprite_data.hpp
diff --git
a/src/sprite/sprite_data.hpp
b/src/sprite/sprite_data.hpp
index
e1e8b8f
..
bc5ccb3
100644
(file)
--- a/
src/sprite/sprite_data.hpp
+++ b/
src/sprite/sprite_data.hpp
@@
-30,8
+30,7
@@
class SpriteData
{
public:
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();
SpriteData(const lisp::Lisp* cur, const std::string& basedir);
~SpriteData();
@@
-51,8
+50,15
@@
private:
std::string name;
/** Position correction */
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;
/** Drawing priority in queue */
int z_order;
@@
-73,4
+79,3
@@
private:
};
#endif
};
#endif
-