X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=d422c2a10c8a4a775bd5098d4d91c4f7a285f082;hb=7e15c4f871809033278711a6e9327616da00c4c9;hp=32e3674e587a0cd36eeb07055a95ba8e2122bc60;hpb=0787a91b484e283316770f19896a4406090450d7;p=supertux.git

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 32e3674e5..d422c2a10 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -27,12 +27,12 @@
 #include "player.hpp"
 #include "audio/sound_manager.hpp"
 
-GrowUp::GrowUp()
-	: MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
+GrowUp::GrowUp(Direction direction)
+        : MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
   physic.enable_gravity(true);
-  physic.set_velocity_x(100);
-  sound_manager->preload("sounds/grow.wav");
+  physic.set_velocity_x((direction == LEFT)?-100:100);
+  sound_manager->preload("sounds/grow.ogg");
 }
 
 void
@@ -41,28 +41,39 @@ GrowUp::update(float elapsed_time)
   movement = physic.get_movement(elapsed_time);
 }
 
-HitResponse
-GrowUp::collision(GameObject& other, const CollisionHit& hit)
+void
+GrowUp::collision_solid(const CollisionHit& hit)
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(fabsf(hit.normal.y) > .5) { // roof or ground
-      physic.set_velocity_y(0);
-    } else { // bumped left or right
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
+  if(hit.top)
+    physic.set_velocity_y(0);
+  if(hit.bottom && physic.get_velocity_y() > 0)
+    physic.set_velocity_y(0);
+  if(hit.left || hit.right)
+    physic.set_velocity_x(-physic.get_velocity_x());
+}
 
-    return CONTINUE;
-  }
-  
+HitResponse
+GrowUp::collision(GameObject& other, const CollisionHit& hit )
+{
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->add_bonus(GROWUP_BONUS, true);
-    sound_manager->play("sounds/grow.wav");
+    if(!player->add_bonus(GROWUP_BONUS, true)){
+      // Tux can't grow right now.
+      collision_solid( hit );
+      return ABORT_MOVE;
+    }
+
+    sound_manager->play("sounds/grow.ogg");
     remove_me();
-    
+
     return ABORT_MOVE;
   }
 
   return FORCE_MOVE;
 }
 
+void
+GrowUp::do_jump()
+{
+    physic.set_velocity_y(-300);
+}