Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23170/src
Modified Files:
player.cpp
Log Message:
Added grabbing while ducking.
Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- player.cpp 25 Aug 2004 05:47:57 -0000 1.158
+++ player.cpp 4 Sep 2004 21:16:05 -0000 1.159
@@ -767,9 +767,12 @@
// 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 */
|
