From: Ryan Flegel <rflegel@gmail.com>
Date: Mon, 24 May 2004 23:03:43 +0000 (+0000)
Subject: - fixed it so arm is not drawn when Tux is shooting and ducking
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e4f1c20a6202b70b99c30538dfc5b4aa963c42ca;p=supertux.git

- 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 7cae89be1..f11b12aab 100644
--- 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);