Changed egg shadow draw layer so it will no longer appear in front of bonusblocks...

[supertux.git] / src / trigger / climbable.cpp

diff --git a/src/trigger/climbable.cpp b/src/trigger/climbable.cpp
index 35ccc06..42b8f60 100644 (file)
--- a/src/trigger/climbable.cpp
+++ b/src/trigger/climbable.cpp
@@ -57,7 +57,7 @@ Climbable::~Climbable()
   }
 }
 
-void 
+void
 Climbable::update(float /*elapsed_time*/)
 {
   if (!climbed_by) return;
@@ -91,8 +91,9 @@ Climbable::event(Player& player, EventType type)
         activate_try_timer.stop();
       } else {
         if (type == EVENT_ACTIVATE) activate_try_timer.start(ACTIVATE_TRY_FOR);
-        if (player.get_bbox().p1.x < get_bbox().p1.x - GRACE_DX) player.add_velocity(Vector(POSITION_FIX_AX,0));
-        if (player.get_bbox().p2.x > get_bbox().p2.x + GRACE_DX) player.add_velocity(Vector(-POSITION_FIX_AX,0));
+        // the "-13" to y velocity prevents Tux from walking in place on the ground for horizonal adjustments
+        if (player.get_bbox().p1.x < get_bbox().p1.x - GRACE_DX) player.add_velocity(Vector(POSITION_FIX_AX,-13));
+        if (player.get_bbox().p2.x > get_bbox().p2.x + GRACE_DX) player.add_velocity(Vector(-POSITION_FIX_AX,-13));
         if (player.get_bbox().p1.y < get_bbox().p1.y - GRACE_DY) player.add_velocity(Vector(0,POSITION_FIX_AY));
         if (player.get_bbox().p2.y > get_bbox().p2.y + GRACE_DY) player.add_velocity(Vector(0,-POSITION_FIX_AY));
       }
@@ -105,7 +106,7 @@ Climbable::event(Player& player, EventType type)
 }
 
 bool
-Climbable::may_climb(Player& player) 
+Climbable::may_climb(Player& player)
 {
   if (player.get_bbox().p1.x < get_bbox().p1.x - GRACE_DX) return false;
   if (player.get_bbox().p2.x > get_bbox().p2.x + GRACE_DX) return false;