From f6311893402a0d4add3e187e4d95d9c8247cb6c8 Mon Sep 17 00:00:00 2001 From: Marek Moeckel Date: Wed, 5 Oct 2005 13:53:06 +0000 Subject: [PATCH] moved some code SVN-Revision: 2811 --- src/object/player.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/object/player.cpp b/src/object/player.cpp index 2d9847579..aee2daa96 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -191,14 +191,6 @@ Player::update(float elapsed_time) bbox.get_height()*0.66666 - 32); grabbed_object->grab(*this, pos); } - - if (backflipping) { - if (backflip_direction == 0) { - dir == LEFT ? backflip_direction = 1 : backflip_direction = -1; - } - else backflip_direction == 1 ? dir = LEFT : dir = RIGHT; //prevent player from changing direction when backflipping - if (backflip_timer.check()) physic.set_velocity_x(100 * backflip_direction); - } } bool @@ -451,6 +443,14 @@ Player::handle_input() { /* Handle horizontal movement: */ if (!backflipping) handle_horizontal_input(); + else { + if (backflip_direction == 0) { + dir == LEFT ? backflip_direction = 1 : backflip_direction = -1; + } + else backflip_direction == 1 ? dir = LEFT : dir = RIGHT; //prevent player from changing direction when backflipping + if (backflip_timer.check()) physic.set_velocity_x(100 * backflip_direction); + } + /* Jump/jumping? */ if (on_ground() && !controller->hold(Controller::JUMP)) -- 2.11.0