Changed collision code, we now have several collision groups:

[supertux.git] / src / object / powerup.cpp

diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index 9d3ff93..c7df315 100644 (file)
--- a/src/object/powerup.cpp
+++ b/src/object/powerup.cpp
@@ -36,9 +36,13 @@ PowerUp::PowerUp(const lisp::Lisp& lisp)
   lisp.get("y", bbox.p1.y);
   lisp.get("sprite", sprite_name);
   lisp.get("script", script);
+  no_physics = false;
+  lisp.get("disable-physics", no_physics);
   bbox.set_size(32, 32);   
   sprite = sprite_manager->create(sprite_name);
   physic.enable_gravity(true);
+
+  set_group(COLGROUP_MOVING);
 }
 
 PowerUp::~PowerUp()
@@ -89,7 +93,8 @@ PowerUp::collision(GameObject& other, const CollisionHit& hit)
 void
 PowerUp::update(float elapsed_time)
 {
-  movement = physic.get_movement(elapsed_time);
+  if (!no_physics)
+    movement = physic.get_movement(elapsed_time);
 }
 
 void