Fix crash on ESC press when no music is playing

[supertux.git] / src / object / thunderstorm.cpp

diff --git a/src/object/thunderstorm.cpp b/src/object/thunderstorm.cpp
index f86279c..af9e410 100644 (file)
--- a/src/object/thunderstorm.cpp
+++ b/src/object/thunderstorm.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Thunderstorm Game Object
 //  Copyright (C) 2006 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,35 +12,31 @@
 //  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 <config.h>
+#include "object/thunderstorm.hpp"
 
-#include "thunderstorm.hpp"
-#include "scripting/squirrel_util.hpp"
 #include "audio/sound_manager.hpp"
-#include "video/drawing_context.hpp"
-#include "object_factory.hpp"
 #include "object/electrifier.hpp"
-
-#include <stdexcept>
-#include <iostream>
-#include "main.hpp"
-#include "resources.hpp"
-#include "sector.hpp"
-#include "gettext.hpp"
-#include "object/player.hpp"
-#include "lisp/list_iterator.hpp"
-#include "log.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 
 namespace {
-       const float LIGHTNING_DELAY = 2.0;
-       const float FLASH_DISPLAY_TIME = 0.1;
+const float LIGHTNING_DELAY = 2.0f;
+const float FLASH_DISPLAY_TIME = 0.1f;
+const float ELECTRIFY_TIME = 0.5f;
 }
 
-Thunderstorm::Thunderstorm(const lisp::Lisp& reader)
-       : name(""), running(true), interval(10.0f)
+Thunderstorm::Thunderstorm(const Reader& reader) :
+  running(true),
+  interval(10.0f),
+  layer(LAYER_BACKGROUNDTILES-1),
+  time_to_thunder(),
+  time_to_lightning(),
+  flash_display_timer()
 {
   reader.get("name", name);
   reader.get("running", running);
@@ -50,9 +44,10 @@ Thunderstorm::Thunderstorm(const lisp::Lisp& reader)
   if(interval <= 0) {
     log_warning << "Running a thunderstorm with non-positive time interval is a bad idea" << std::endl;
   }
+  layer = reader_get_layer (reader, /* default = */ LAYER_BACKGROUNDTILES-1);
 
-  sound_manager->preload("sounds/explosion.wav");
-  sound_manager->preload("sounds/upgrade.wav");
+  SoundManager::current()->preload("sounds/thunder.wav");
+  SoundManager::current()->preload("sounds/lightning.wav");
 
   if (running) {
     running = false; // else start() is ignored
@@ -82,7 +77,7 @@ Thunderstorm::draw(DrawingContext& context)
   float alpha = 0.33f;
   context.push_transform();
   context.set_translation(Vector(0, 0));
-  context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), Color(1, 1, 1, alpha), LAYER_BACKGROUNDTILES-1);
+  context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), Color(1, 1, 1, alpha), layer);
   context.pop_transform();
 
 }
@@ -91,15 +86,15 @@ void
 Thunderstorm::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name == "") return;
-  Scripting::Thunderstorm* interface = new Scripting::Thunderstorm(this);
-  expose_object(vm, table_idx, interface, name, true);
+  scripting::Thunderstorm* _this = new scripting::Thunderstorm(this);
+  expose_object(vm, table_idx, _this, name, true);
 }
 
 void
 Thunderstorm::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name == "") return;
-  Scripting::unexpose_object(vm, table_idx, name);
+  scripting::unexpose_object(vm, table_idx, name);
 }
 
 void
@@ -123,7 +118,7 @@ Thunderstorm::stop()
 void
 Thunderstorm::thunder()
 {
-  sound_manager->play("sounds/explosion.wav");
+  SoundManager::current()->play("sounds/thunder.wav");
 }
 
 void
@@ -136,16 +131,15 @@ Thunderstorm::lightning()
 void
 Thunderstorm::flash()
 {
-  sound_manager->play("sounds/upgrade.wav");
-  sound_manager->play("sounds/explosion.wav");
+  SoundManager::current()->play("sounds/lightning.wav");
   flash_display_timer.start(FLASH_DISPLAY_TIME);
 }
 
 void
 Thunderstorm::electrify()
 {
-  Sector::current()->add_object(new Electrifier(75, 1421, 0.5));
-  Sector::current()->add_object(new Electrifier(76, 1422, 0.5));
+  Sector::current()->add_object(std::make_shared<Electrifier>(200, 1421, ELECTRIFY_TIME));
+  Sector::current()->add_object(std::make_shared<Electrifier>(201, 1422, ELECTRIFY_TIME));
 }
 
-IMPLEMENT_FACTORY(Thunderstorm, "thunderstorm");
+/* EOF */