Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...

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

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index db86615..d422c2a 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -28,11 +28,11 @@
 #include "audio/sound_manager.hpp"
 
 GrowUp::GrowUp(Direction direction)
-       : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
+        : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
   physic.enable_gravity(true);
   physic.set_velocity_x((direction == LEFT)?-100:100);
-  sound_manager->preload("sounds/grow.wav");
+  sound_manager->preload("sounds/grow.ogg");
 }
 
 void
@@ -53,14 +53,17 @@ GrowUp::collision_solid(const CollisionHit& hit)
 }
 
 HitResponse
-GrowUp::collision(GameObject& other, const CollisionHit& )
+GrowUp::collision(GameObject& other, const CollisionHit& hit )
 {
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    if(!player->add_bonus(GROWUP_BONUS, true))
-      return FORCE_MOVE;
+    if(!player->add_bonus(GROWUP_BONUS, true)){
+      // Tux can't grow right now.
+      collision_solid( hit );
+      return ABORT_MOVE;
+    }
 
-    sound_manager->play("sounds/grow.wav");
+    sound_manager->play("sounds/grow.ogg");
     remove_me();
 
     return ABORT_MOVE;