projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...
[supertux.git]
/
src
/
object
/
star.hpp
diff --git
a/src/object/star.hpp
b/src/object/star.hpp
index
5cd409f
..
e3f4f04
100644
(file)
--- a/
src/object/star.hpp
+++ b/
src/object/star.hpp
@@
-20,23
+20,19
@@
#ifndef __STAR_H__
#define __STAR_H__
#ifndef __STAR_H__
#define __STAR_H__
-#include "moving_object.hpp"
-#include "sprite/sprite.hpp"
+#include "object/moving_sprite.hpp"
#include "physic.hpp"
#include "physic.hpp"
+#include "direction.hpp"
-class Star : public Moving
Object
+class Star : public Moving
Sprite, private UsesPhysic
{
public:
{
public:
- Star(const Vector& pos);
- ~Star();
+ Star(const Vector& pos
, Direction direction = RIGHT
);
+ virtual Star* clone() const { return new Star(*this); }
virtual void update(float elapsed_time);
virtual void update(float elapsed_time);
- virtual void
draw(DrawingContext& contex
t);
+ virtual void
collision_solid(const CollisionHit& hi
t);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-
-private:
- Sprite* sprite;
- Physic physic;
};
#endif
};
#endif