[Super-tux-commit] supertux/src player.cpp,1.169,1.170
Brought to you by:
wkendrick
From: Marek M. <wa...@us...> - 2004-09-16 20:58:53
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31708/src Modified Files: player.cpp Log Message: just changed tabs for spaces :) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- player.cpp 16 Sep 2004 20:48:09 -0000 1.169 +++ player.cpp 16 Sep 2004 20:58:41 -0000 1.170 @@ -535,9 +535,9 @@ --base.y; jumping = true; - double_jumping = false; + double_jumping = false; can_jump = false; - can_double_jump = false; + can_double_jump = false; if (size == SMALL) SoundManager::get()->play_sound(IDToSound(SND_JUMP)); else @@ -547,30 +547,30 @@ else if(input.up == UP && jumping && physic.get_velocity_y() > 0) { if (!double_jumping && !duck) {can_double_jump = true;} - jumping = false; + jumping = false; physic.set_velocity_y(0); } - - // Double jump - if (input.up == DOWN && can_double_jump) - { - can_double_jump = false; - jumping = true; - double_jumping = true; - if (size == SMALL) + + // Double jump + if (input.up == DOWN && can_double_jump) + { + can_double_jump = false; + jumping = true; + double_jumping = true; + if (size == SMALL) SoundManager::get()->play_sound(IDToSound(SND_JUMP)); else SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP)); - physic.set_velocity_y(5.2); - } - - // Hover + physic.set_velocity_y(5.2); + } + + // Hover //(disabled by default, use cheat code "hover" to toggle on/off) - //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys - if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0) - { - physic.set_velocity_y(-1); - } + //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys + if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0) + { + physic.set_velocity_y(-1); + } /* In case the player has pressed Down while in a certain range of air, enable butt jump action */ |