[Super-tux-commit] supertux/src player.cpp,1.120,1.121

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12652

Modified Files:
	player.cpp 
Log Message:
- fixed it so arm is not drawn when Tux is shooting and ducking

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- player.cpp	24 May 2004 21:02:27 -0000	1.120
+++ player.cpp	24 May 2004 23:03:43 -0000	1.121
@@ -626,7 +626,7 @@
 
   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);