Add a constant for how long electrify lasts

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

diff --git a/src/object/thunderstorm.cpp b/src/object/thunderstorm.cpp
index 6a8aeff..ba4e549 100644 (file)
--- a/src/object/thunderstorm.cpp
+++ b/src/object/thunderstorm.cpp
@@ -27,6 +27,7 @@
 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) :
@@ -45,8 +46,8 @@ Thunderstorm::Thunderstorm(const Reader& reader) :
   }
   reader.get("layer", layer);
 
-  sound_manager->preload("sounds/explosion.wav");
-  sound_manager->preload("sounds/upgrade.wav");
+  sound_manager->preload("sounds/thunder.wav");
+  sound_manager->preload("sounds/lightning.wav");
 
   if (running) {
     running = false; // else start() is ignored
@@ -117,7 +118,7 @@ Thunderstorm::stop()
 void
 Thunderstorm::thunder()
 {
-  sound_manager->play("sounds/explosion.wav");
+  sound_manager->play("sounds/thunder.wav");
 }
 
 void
@@ -130,18 +131,15 @@ Thunderstorm::lightning()
 void
 Thunderstorm::flash()
 {
-  sound_manager->play("sounds/upgrade.wav");
-  sound_manager->play("sounds/explosion.wav");
+  sound_manager->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(new Electrifier(200, 1421, ELECTRIFY_TIME));
+  Sector::current()->add_object(new Electrifier(201, 1422, ELECTRIFY_TIME));
 }
 
-IMPLEMENT_FACTORY(Thunderstorm, "thunderstorm");
-
 /* EOF */