From 423d148f5092d47a5f97ea64b74ad65ca89ba67d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Ho=C5=A1ek?= Date: Sun, 7 Oct 2007 09:08:29 +0000 Subject: [PATCH] Fix #239: take current game speed into consideration while starting end sequence timer SVN-Revision: 5161 --- src/object/endsequence_fireworks.cpp | 3 ++- src/object/endsequence_walkleft.cpp | 3 ++- src/object/endsequence_walkright.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/object/endsequence_fireworks.cpp b/src/object/endsequence_fireworks.cpp index dbd3695ea..7cd940f08 100644 --- a/src/object/endsequence_fireworks.cpp +++ b/src/object/endsequence_fireworks.cpp @@ -20,6 +20,7 @@ #include #include "endsequence_fireworks.hpp" #include "sector.hpp" +#include "mainloop.hpp" #include "object/player.hpp" #include "object/fireworks.hpp" @@ -41,7 +42,7 @@ void EndSequenceFireworks::starting() { EndSequence::starting(); - endsequence_timer.start(7.3f); + endsequence_timer.start(7.3f * main_loop->get_speed()); Sector::current()->add_object(new Fireworks()); } diff --git a/src/object/endsequence_walkleft.cpp b/src/object/endsequence_walkleft.cpp index ca5d1c7bf..bf871054c 100644 --- a/src/object/endsequence_walkleft.cpp +++ b/src/object/endsequence_walkleft.cpp @@ -20,6 +20,7 @@ #include #include "endsequence_walkleft.hpp" #include "sector.hpp" +#include "mainloop.hpp" #include "object/player.hpp" EndSequenceWalkLeft::EndSequenceWalkLeft() @@ -41,7 +42,7 @@ EndSequenceWalkLeft::starting() { EndSequence::starting(); last_x_pos = -1; - endsequence_timer.start(7.3f); + endsequence_timer.start(7.3f * main_loop->get_speed()); } void diff --git a/src/object/endsequence_walkright.cpp b/src/object/endsequence_walkright.cpp index c208896d8..32f529e9a 100644 --- a/src/object/endsequence_walkright.cpp +++ b/src/object/endsequence_walkright.cpp @@ -20,6 +20,7 @@ #include #include "endsequence_walkright.hpp" #include "sector.hpp" +#include "mainloop.hpp" #include "object/player.hpp" EndSequenceWalkRight::EndSequenceWalkRight() @@ -41,7 +42,7 @@ EndSequenceWalkRight::starting() { EndSequence::starting(); last_x_pos = -1; - endsequence_timer.start(7.3f); + endsequence_timer.start(7.3f * main_loop->get_speed()); } void -- 2.11.0