Fix #239: take current game speed into consideration while starting end sequence...

SVN-Revision: 5161

diff --git a/src/object/endsequence_fireworks.cpp b/src/object/endsequence_fireworks.cpp
index dbd3695..7cd940f 100644 (file)
--- a/src/object/endsequence_fireworks.cpp
+++ b/src/object/endsequence_fireworks.cpp
@@ -20,6 +20,7 @@
 #include <config.h>
 #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 ca5d1c7..bf87105 100644 (file)
--- a/src/object/endsequence_walkleft.cpp
+++ b/src/object/endsequence_walkleft.cpp
@@ -20,6 +20,7 @@
 #include <config.h>
 #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 c208896..32f529e 100644 (file)
--- a/src/object/endsequence_walkright.cpp
+++ b/src/object/endsequence_walkright.cpp
@@ -20,6 +20,7 @@
 #include <config.h>
 #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