X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fendsequence.cpp;h=2e4cc6a4133fbde3d7d05d612df746939bf6ae9e;hb=d427db3e7c37d524e540511dd8cfce6e985bf32b;hp=dac0b8f5ca34248f752a15aef14cf3244c881654;hpb=a1bbd50a338ffcda9933848e20bb1de344f25104;p=supertux.git diff --git a/src/object/endsequence.cpp b/src/object/endsequence.cpp index dac0b8f5c..2e4cc6a41 100644 --- a/src/object/endsequence.cpp +++ b/src/object/endsequence.cpp @@ -51,7 +51,7 @@ void EndSequence::update(float elapsed_time) { if (!isrunning) return; - running(elapsed_time); + running(elapsed_time); } void @@ -65,7 +65,7 @@ EndSequence::start() if (isrunning) return; isrunning = true; isdone = false; - + Player& tux = *Sector::current()->player; end_sequence_controller = new CodeController(); tux.set_controller(end_sequence_controller); @@ -100,33 +100,18 @@ EndSequence::is_done() { return isdone; } - + void EndSequence::starting() { - last_x_pos = -1; - endsequence_timer.start(7.3); } void EndSequence::running(float /*elapsed_time*/) { - Player& tux = *Sector::current()->player; - - if (tux_may_walk) { - end_sequence_controller->press(Controller::RIGHT); - if (int(last_x_pos) == int(tux.get_pos().x)) { - end_sequence_controller->press(Controller::JUMP); - } - } - - last_x_pos = tux.get_pos().x; - - if (endsequence_timer.check()) isdone = true; } void EndSequence::stopping() { } -