X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpowerup.hpp;h=4779db17063ab1fb97d6078b67a71a1304c5f6c4;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=91d673827ca52b66dff635f66cb326cd710018e0;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/powerup.hpp b/src/object/powerup.hpp index 91d673827..4779db170 100644 --- a/src/object/powerup.hpp +++ b/src/object/powerup.hpp @@ -20,29 +20,23 @@ #ifndef __POWERUP_H__ #define __POWERUP_H__ -#include "moving_object.hpp" +#include "object/moving_sprite.hpp" #include "lisp/lisp.hpp" -#include "sprite/sprite.hpp" #include "collision_hit.hpp" #include "physic.hpp" -class PowerUp : public MovingObject +class PowerUp : public MovingSprite, private UsesPhysic { public: PowerUp(const lisp::Lisp& lisp); - ~PowerUp(); virtual void update(float elapsed_time); - virtual void draw(DrawingContext& context); + virtual void collision_solid(const CollisionHit& hit); virtual HitResponse collision(GameObject& other, const CollisionHit& hit); - + private: - std::string sprite_name; - Sprite* sprite; - Physic physic; std::string script; bool no_physics; }; #endif -