#include "audio/sound_manager.hpp"
#include "object/electrifier.hpp"
#include "scripting/squirrel_util.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
#include "supertux/object_factory.hpp"
#include "supertux/sector.hpp"
#include "util/reader.hpp"
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),
- layer(LAYER_BACKGROUNDTILES-1)
+ interval(10.0f),
+ layer(LAYER_BACKGROUNDTILES-1),
+ time_to_thunder(),
+ time_to_lightning(),
+ flash_display_timer()
{
reader.get("name", name);
reader.get("running", running);
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
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
void
Thunderstorm::thunder()
{
- sound_manager->play("sounds/explosion.wav");
+ SoundManager::current()->play("sounds/thunder.wav");
}
void
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 */