projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
object
/
powerup.hpp
diff --git
a/src/object/powerup.hpp
b/src/object/powerup.hpp
index
91d6738
..
4779db1
100644
(file)
--- a/
src/object/powerup.hpp
+++ b/
src/object/powerup.hpp
@@
-20,29
+20,23
@@
#ifndef __POWERUP_H__
#define __POWERUP_H__
#ifndef __POWERUP_H__
#define __POWERUP_H__
-#include "
moving_object
.hpp"
+#include "
object/moving_sprite
.hpp"
#include "lisp/lisp.hpp"
#include "lisp/lisp.hpp"
-#include "sprite/sprite.hpp"
#include "collision_hit.hpp"
#include "physic.hpp"
#include "collision_hit.hpp"
#include "physic.hpp"
-class PowerUp : public Moving
Object
+class PowerUp : public Moving
Sprite, private UsesPhysic
{
public:
PowerUp(const lisp::Lisp& lisp);
{
public:
PowerUp(const lisp::Lisp& lisp);
- ~PowerUp();
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:
private:
- std::string sprite_name;
- Sprite* sprite;
- Physic physic;
std::string script;
bool no_physics;
};
#endif
std::string script;
bool no_physics;
};
#endif
-