- fixed it so arm is not drawn when Tux is shooting and ducking

SVN-Revision: 1318

diff --git a/src/player.cpp b/src/player.cpp
index 7cae89b..f11b12a 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -626,7 +626,7 @@ Player::draw(Camera& viewport, int layer)
 
   if(layer == LAYER_OBJECTS + 1) {
     // Draw arm overlay graphics when Tux is holding something
-    if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check())
+    if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck)
     {
       if (dir == RIGHT)
         sprite->grab_right->draw(pos);