Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8688
Modified Files:
player.cpp
Log Message:
- changed priority of skid and duck to avoid glitches when ducking and skiding at the same time
Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- player.cpp 26 Apr 2004 10:03:34 -0000 1.66
+++ player.cpp 26 Apr 2004 13:13:51 -0000 1.67
@@ -508,48 +508,45 @@
else
sprite = &largetux;
- if (skidding_timer.started())
+ if (duck)
+ {
+ if (dir == RIGHT)
+ sprite->duck_right->draw(base.x - scroll_x, base.y);
+ else
+ sprite->duck_left->draw(base.x - scroll_x, base.y);
+ }
+ else if (skidding_timer.started())
{
if (dir == RIGHT)
sprite->skid_right->draw(base.x - scroll_x, base.y);
else
sprite->skid_left->draw(base.x - scroll_x, base.y);
}
+ else if (physic.get_velocity_y() != 0)
+ {
+ if (dir == RIGHT)
+ sprite->jump_right->draw(base.x - scroll_x, base.y);
+ else
+ sprite->jump_left->draw(base.x - scroll_x, base.y);
+ }
else
{
- if (duck)
- {
- if (dir == RIGHT)
- sprite->duck_right->draw(base.x - scroll_x, base.y);
- else
- sprite->duck_left->draw(base.x - scroll_x, base.y);
- }
- else if (physic.get_velocity_y() != 0)
+ if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
{
if (dir == RIGHT)
- sprite->jump_right->draw(base.x - scroll_x, base.y);
+ sprite->stand_right->draw( base.x - scroll_x, base.y);
else
- sprite->jump_left->draw(base.x - scroll_x, base.y);
+ sprite->stand_left->draw( base.x - scroll_x, base.y);
}
- else
+ else // moving
{
- if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
- {
- if (dir == RIGHT)
- sprite->stand_right->draw( base.x - scroll_x, base.y);
- else
- sprite->stand_left->draw( base.x - scroll_x, base.y);
- }
- else // moving
- {
- if (dir == RIGHT)
- sprite->walk_right->draw(base.x - scroll_x, base.y);
- else
- sprite->walk_left->draw(base.x - scroll_x, base.y);
- }
+ if (dir == RIGHT)
+ sprite->walk_right->draw(base.x - scroll_x, base.y);
+ else
+ sprite->walk_left->draw(base.x - scroll_x, base.y);
}
}
-
+
// Draw arm overlay graphics when Tux is holding something
if (holding_something && physic.get_velocity_y() == 0)
{
|
