X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fendsequence_fireworks.cpp;h=b971b25ba70d5c1eb1ab7d98a400dd1cfd078986;hb=b91dbe6bc1d5047a127cdc688dda836c59e8c2d1;hp=dbd3695eae90262e71d611df60194a44cce27433;hpb=94f5f77ebdecb14317c610a2a8c686c576e4722a;p=supertux.git

diff --git a/src/object/endsequence_fireworks.cpp b/src/object/endsequence_fireworks.cpp
index dbd3695ea..b971b25ba 100644
--- a/src/object/endsequence_fireworks.cpp
+++ b/src/object/endsequence_fireworks.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - End Sequence: Tux walks right
 //  Copyright (C) 2007 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,17 +12,18 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/endsequence_fireworks.hpp"
 
-#include <config.h>
-#include "endsequence_fireworks.hpp"
-#include "sector.hpp"
-#include "object/player.hpp"
 #include "object/fireworks.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/screen_manager.hpp"
+#include "supertux/sector.hpp"
 
-EndSequenceFireworks::EndSequenceFireworks()
-: EndSequence()
+EndSequenceFireworks::EndSequenceFireworks() :
+  EndSequence(),
+  endsequence_timer()
 {
 }
 
@@ -41,8 +40,8 @@ void
 EndSequenceFireworks::starting()
 {
   EndSequence::starting();
-  endsequence_timer.start(7.3f);
-  Sector::current()->add_object(new Fireworks());
+  endsequence_timer.start(7.3f * ScreenManager::current()->get_speed());
+  Sector::current()->add_object(std::make_shared<Fireworks>());
 }
 
 void
@@ -63,3 +62,5 @@ EndSequenceFireworks::stopping()
 {
   EndSequence::stopping();
 }
+
+/* EOF */