X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameloop.cpp;h=fb3e557718a47de299cf63951ea99ed0cb1415f6;hb=d26d9e424eed4bd31dfdf023a120e6ebf3270eba;hp=a44cd8e907b1ce8413a8cc2389af75f8551d903c;hpb=263262d1c9a0ce12c639c01c58d638f8b17a3d7b;p=supertux.git diff --git a/src/gameloop.cpp b/src/gameloop.cpp index a44cd8e90..fb3e55771 100644 --- a/src/gameloop.cpp +++ b/src/gameloop.cpp @@ -546,7 +546,6 @@ GameSession::run() draw(); - float overlap = 0.0f; while (exit_status == NONE) { /* Calculate the movement-factor */ @@ -569,19 +568,12 @@ GameSession::run() // determistic and not different on different machines if(!game_pause && !Menu::current()) { - frame_ratio *= game_speed; - frame_ratio += overlap; - while (frame_ratio > 0) - { - // Update the world - check_end_conditions(); - if (end_sequence == ENDSEQUENCE_RUNNING) - action(.5f); - else if(end_sequence == NO_ENDSEQUENCE) - action(1.0f); - frame_ratio -= 1.0f; - } - overlap = frame_ratio; + // Update the world + check_end_conditions(); + if (end_sequence == ENDSEQUENCE_RUNNING) + action(frame_ratio/2); + else if(end_sequence == NO_ENDSEQUENCE) + action(frame_ratio); } else {