added a powerup object that can be placed in levels and represent various powerups...

[supertux.git] / src / object / bullet.h

diff --git a/src/object/bullet.h b/src/object/bullet.h
index 58df31b..ea176d3 100644 (file)
--- a/src/object/bullet.h
+++ b/src/object/bullet.h
@@ -17,16 +17,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef __BULLET_H__
 #define __BULLET_H__
 
 #include "moving_object.h"
-#include "math/physic.h"
+#include "physic.h"
 #include "sprite/sprite.h"
 
-using namespace SuperTux;
-
 enum BulletsKind {
   FIRE_BULLET,
   ICE_BULLET
@@ -38,7 +35,7 @@ public:
   Bullet(const Vector& pos, float xm, int dir, int kind);
   ~Bullet();
   
-  void action(float elapsed_time);
+  void update(float elapsed_time);
   void draw(DrawingContext& context);
   HitResponse collision(GameObject& other, const CollisionHit& hit);