Fix cmake download path

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

diff --git a/src/object/thunderstorm.cpp b/src/object/thunderstorm.cpp
index b6abf87..af9e410 100644 (file)
--- a/src/object/thunderstorm.cpp
+++ b/src/object/thunderstorm.cpp
@@ -27,11 +27,12 @@
 namespace {
 const float LIGHTNING_DELAY = 2.0f;
 const float FLASH_DISPLAY_TIME = 0.1f;
+const float ELECTRIFY_TIME = 0.5f;
 }
 
 Thunderstorm::Thunderstorm(const Reader& reader) :
   running(true),
-  interval(10.0f), 
+  interval(10.0f),
   layer(LAYER_BACKGROUNDTILES-1),
   time_to_thunder(),
   time_to_lightning(),
@@ -43,10 +44,10 @@ Thunderstorm::Thunderstorm(const Reader& reader) :
   if(interval <= 0) {
     log_warning << "Running a thunderstorm with non-positive time interval is a bad idea" << std::endl;
   }
-  reader.get("layer", layer);
+  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
@@ -85,8 +86,8 @@ 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
@@ -117,7 +118,7 @@ Thunderstorm::stop()
 void
 Thunderstorm::thunder()
 {
-  sound_manager->play("sounds/explosion.wav");
+  SoundManager::current()->play("sounds/thunder.wav");
 }
 
 void
@@ -130,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));
 }
 
 /* EOF */