[Super-tux-commit] supertux/src player.cpp,1.154,1.155
Brought to you by:
wkendrick
From: Ricardo C. <rm...@us...> - 2004-08-18 10:32:05
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5030/src Modified Files: player.cpp Log Message: Idle change. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- player.cpp 17 Aug 2004 23:23:11 -0000 1.154 +++ player.cpp 18 Aug 2004 10:31:49 -0000 1.155 @@ -820,22 +820,22 @@ } } } -/* + if(idle_timer.get_left() < 0) { if (dir == RIGHT) { - tux_body->set_action("idle-right"); - tux_body->one_time_animation(); + tux_body->head->set_action("idle-right"); + tux_body->head->start_animation(1); } else { - tux_body->set_action("idle-left"); - tux_body->one_time_animation(); + tux_body->head->set_action("idle-right"); + tux_body->head->start_animation(1); } idle_timer.start(IDLE_TIME); } -*/ + // Tux is holding something if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck) |