Merged patch for issue 0000298: supertux fails to compile with gcc 4.3 (submitted...

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

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 1d256db..db86615 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -44,7 +44,9 @@ GrowUp::update(float elapsed_time)
 void
 GrowUp::collision_solid(const CollisionHit& hit)
 {
-  if(hit.top || hit.bottom)
+  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());
@@ -66,3 +68,9 @@ GrowUp::collision(GameObject& other, const CollisionHit& )
 
   return FORCE_MOVE;
 }
+
+void
+GrowUp::do_jump()
+{
+    physic.set_velocity_y(-300);
+}