From c060e84aa2188fb573df9115802c1ef98be871fb Mon Sep 17 00:00:00 2001
From: Ricardo Cruz <rick2@aeiou.pt>
Date: Sat, 4 Sep 2004 21:16:05 +0000
Subject: [PATCH] Added grabbing while ducking.

SVN-Revision: 1865
---
 src/player.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/player.cpp b/src/player.cpp
index 05643ecfe..a2e168e6f 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -767,9 +767,12 @@ Player::draw(DrawingContext& context)
 
   // Tux is holding something
   if ((holding_something && physic.get_velocity_y() == 0) ||
-      shooting_timer.check() && !duck)
+      shooting_timer.check())
     {
-    tux_body->arms->set_action("grab");
+    if (duck)
+      tux_body->arms->set_action("duck+grab");
+    else
+      tux_body->arms->set_action("grab");
     }
 
   /* Draw Tux */
-- 
2.11.0