projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged gravity patch by T. Goya
[supertux.git]
/
src
/
object
/
bullet.hpp
diff --git
a/src/object/bullet.hpp
b/src/object/bullet.hpp
index
b18e375
..
7891447
100644
(file)
--- a/
src/object/bullet.hpp
+++ b/
src/object/bullet.hpp
@@
-25,7
+25,7
@@
#include "sprite/sprite.hpp"
#include "player_status.hpp"
#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);
{
public:
Bullet(const Vector& pos, float xm, int dir, BonusType type);
@@
-50,7
+50,6
@@
public:
private:
int life_count;
private:
int life_count;
- Physic physic;
std::auto_ptr<Sprite> sprite;
BonusType type;
};
std::auto_ptr<Sprite> sprite;
BonusType type;
};