X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fbullet.hpp;h=c3464d7d5344330786491a65d5fe1f933199f799;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=b18e375cd9e5878d626e748a83f43a290ec6edd3;hpb=ab215c41de1a14f594221e8b43a442d607b6a775;p=supertux.git diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp index b18e375cd..c3464d7d5 100644 --- a/src/object/bullet.hpp +++ b/src/object/bullet.hpp @@ -25,7 +25,7 @@ #include "sprite/sprite.hpp" #include "player_status.hpp" -class Bullet : public MovingObject +class Bullet : public MovingObject, private UsesPhysic { public: Bullet(const Vector& pos, float xm, int dir, BonusType type); @@ -42,7 +42,7 @@ public: * Note that the @c hit parameter is filled in as perceived by the object, not by the bullet. */ void ricochet(GameObject& other, const CollisionHit& hit); - + BonusType get_type() { return type; @@ -50,7 +50,6 @@ public: private: int life_count; - Physic physic; std::auto_ptr sprite; BonusType type; };