Turned a lot of other global objects into Currentons

src/audio/sound_manager.hpp

@@ -26,13 +26,14 @@
 #include <alc.h>
 
 #include "math/vector.hpp"
+#include "util/currenton.hpp"
 
 class SoundFile;
 class SoundSource;
 class StreamSoundSource;
 class OpenALSoundSource;
 
-class SoundManager
+class SoundManager : public Currenton<SoundManager>
 {
 public:
   SoundManager();

src/audio/stream_sound_source.cpp

@@ -30,13 +30,13 @@ StreamSoundSource::StreamSoundSource() :
   alGenBuffers(STREAMFRAGMENTS, buffers);
   SoundManager::check_al_error("Couldn't allocate audio buffers: ");
   //add me to update list
-  sound_manager->register_for_update( this );
+  SoundManager::current()->register_for_update( this );
 }
 
 StreamSoundSource::~StreamSoundSource()
 {
   //don't update me any longer
-  sound_manager->remove_from_update( this );
+  SoundManager::current()->remove_from_update( this );
   file.reset();
   stop();
   alDeleteBuffers(STREAMFRAGMENTS, buffers);

src/badguy/badguy.cpp

@@ -53,8 +53,8 @@ BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name_, int layer_) :
 {
   start_position = bbox.p1;
 
-  sound_manager->preload("sounds/squish.wav");
-  sound_manager->preload("sounds/fall.wav");
+  SoundManager::current()->preload("sounds/squish.wav");
+  SoundManager::current()->preload("sounds/fall.wav");
 
   dir = (start_dir == AUTO) ? LEFT : start_dir;
 }
@@ -79,8 +79,8 @@ BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite
 {
   start_position = bbox.p1;
 
-  sound_manager->preload("sounds/squish.wav");
-  sound_manager->preload("sounds/fall.wav");
+  SoundManager::current()->preload("sounds/squish.wav");
+  SoundManager::current()->preload("sounds/fall.wav");
 
   dir = (start_dir == AUTO) ? LEFT : start_dir;
 }
@@ -112,8 +112,8 @@ BadGuy::BadGuy(const Reader& reader, const std::string& sprite_name_, int layer_
 
   reader.get("dead-script", dead_script);
 
-  sound_manager->preload("sounds/squish.wav");
-  sound_manager->preload("sounds/fall.wav");
+  SoundManager::current()->preload("sounds/squish.wav");
+  SoundManager::current()->preload("sounds/fall.wav");
 
   dir = (start_dir == AUTO) ? LEFT : start_dir;
 }
@@ -386,7 +386,7 @@ BadGuy::kill_squished(GameObject& object)
 {
   if (!is_active()) return;
 
-  sound_manager->play("sounds/squish.wav", get_pos());
+  SoundManager::current()->play("sounds/squish.wav", get_pos());
   physic.enable_gravity(true);
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
@@ -406,7 +406,7 @@ BadGuy::kill_fall()
 {
   if (!is_active()) return;
 
-  sound_manager->play("sounds/fall.wav", get_pos());
+  SoundManager::current()->play("sounds/fall.wav", get_pos());
   physic.set_velocity_y(0);
   physic.set_acceleration_y(0);
   physic.enable_gravity(true);

src/badguy/bomb.cpp

@@ -32,7 +32,7 @@ Bomb::Bomb(const Vector& pos, Direction dir_, std::string custom_sprite /*= "ima
   set_action(dir_ == LEFT ? "ticking-left" : "ticking-right", 1);
   countMe = false;
 
-  ticking = sound_manager->create_sound_source("sounds/fizz.wav");
+  ticking = SoundManager::current()->create_sound_source("sounds/fizz.wav");
   ticking->set_position(get_pos());
   ticking->set_looping(true);
   ticking->set_gain(2.0);

src/badguy/dart.cpp

@@ -34,9 +34,9 @@ Dart::Dart(const Reader& reader) :
 {
   physic.enable_gravity(false);
   countMe = false;
-  sound_manager->preload(DART_SOUND);
-  sound_manager->preload("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
+  SoundManager::current()->preload(DART_SOUND);
+  SoundManager::current()->preload("sounds/darthit.wav");
+  SoundManager::current()->preload("sounds/stomp.wav");
 }
 
 Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent_ = 0) :
@@ -46,9 +46,9 @@ Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent_ = 0) :
 {
   physic.enable_gravity(false);
   countMe = false;
-  sound_manager->preload(DART_SOUND);
-  sound_manager->preload("sounds/darthit.wav");
-  sound_manager->preload("sounds/stomp.wav");
+  SoundManager::current()->preload(DART_SOUND);
+  SoundManager::current()->preload("sounds/darthit.wav");
+  SoundManager::current()->preload("sounds/stomp.wav");
 }
 
 Dart::~Dart()
@@ -75,7 +75,7 @@ Dart::initialize()
 void
 Dart::activate()
 {
-  sound_source = sound_manager->create_sound_source(DART_SOUND);
+  sound_source = SoundManager::current()->create_sound_source(DART_SOUND);
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
   sound_source->set_gain(1.0);
@@ -100,7 +100,7 @@ Dart::active_update(float elapsed_time)
 void
 Dart::collision_solid(const CollisionHit& )
 {
-  sound_manager->play("sounds/darthit.wav", get_pos());
+  SoundManager::current()->play("sounds/darthit.wav", get_pos());
   remove_me();
 }
 
@@ -111,7 +111,7 @@ Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
   if (&badguy == parent) {
     return FORCE_MOVE;
   }
-  sound_manager->play("sounds/stomp.wav", get_pos());
+  SoundManager::current()->play("sounds/stomp.wav", get_pos());
   remove_me();
   badguy.kill_fall();
   return ABORT_MOVE;
@@ -120,7 +120,7 @@ Dart::collision_badguy(BadGuy& badguy, const CollisionHit& )
 HitResponse
 Dart::collision_player(Player& player, const CollisionHit& hit)
 {
-  sound_manager->play("sounds/stomp.wav", get_pos());
+  SoundManager::current()->play("sounds/stomp.wav", get_pos());
   remove_me();
   return BadGuy::collision_player(player, hit);
 }

src/badguy/darttrap.cpp

@@ -39,7 +39,7 @@ DartTrap::DartTrap(const Reader& reader) :
   reader.get("fire-delay", fire_delay);
   reader.get("ammo", ammo);
   countMe = false;
-  sound_manager->preload("sounds/dartfire.wav");
+  SoundManager::current()->preload("sounds/dartfire.wav");
   if (start_dir == AUTO) { log_warning << "Setting a DartTrap's direction to AUTO is no good idea" << std::endl; }
   state = IDLE;
   set_colgroup_active(COLGROUP_DISABLED);
@@ -96,7 +96,7 @@ DartTrap::fire()
   float py = get_pos().y;
   py += MUZZLE_Y;
 
-  sound_manager->play("sounds/dartfire.wav", get_pos());
+  SoundManager::current()->play("sounds/dartfire.wav", get_pos());
   Sector::current()->add_object(new Dart(Vector(px, py), dir, this));
   state = IDLE;
   sprite->set_action(dir == LEFT ? "idle-left" : "idle-right");

src/badguy/dispenser.cpp

@@ -39,7 +39,7 @@ Dispenser::Dispenser(const Reader& reader) :
   type()
 {
   set_colgroup_active(COLGROUP_MOVING_STATIC);
-  sound_manager->preload("sounds/squish.wav");
+  SoundManager::current()->preload("sounds/squish.wav");
   reader.get("cycle", cycle);
   reader.get("badguy", badguys);
   random = false; // default
@@ -111,7 +111,7 @@ Dispenser::collision_squished(GameObject& object)
   if (player){
     player->bounce(*this);
   }
-  sound_manager->play("sounds/squish.wav", get_pos());
+  SoundManager::current()->play("sounds/squish.wav", get_pos());
   broken = true;
   return true;
 }

src/badguy/flame.cpp

@@ -35,15 +35,15 @@ Flame::Flame(const Reader& reader) :
   radius(100),
   speed(2),
   light(0.0f,0.0f,0.0f),
-  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite")),
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite")),
   sound_source()
 {
   reader.get("radius", radius);
   reader.get("speed", speed);
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   countMe = false;
-  sound_manager->preload(FLAME_SOUND);
+  SoundManager::current()->preload(FLAME_SOUND);
 
   set_colgroup_active(COLGROUP_TOUCHABLE);
 
@@ -85,7 +85,7 @@ Flame::draw(DrawingContext& context)
 void
 Flame::activate()
 {
-  sound_source = sound_manager->create_sound_source(FLAME_SOUND);
+  sound_source = SoundManager::current()->create_sound_source(FLAME_SOUND);
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
   sound_source->set_gain(2.0);
@@ -108,7 +108,7 @@ Flame::kill_fall()
 void
 Flame::freeze()
 {
-  sound_manager->play("sounds/sizzle.ogg", get_pos());
+  SoundManager::current()->play("sounds/sizzle.ogg", get_pos());
   sprite->set_action("fade", 1);
   Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", bbox.get_middle(), ANCHOR_MIDDLE, Vector(0, -150), Vector(0,0), LAYER_BACKGROUNDTILES+2));
   set_group(COLGROUP_DISABLED);

src/badguy/ghostflame.cpp

@@ -33,15 +33,15 @@ Ghostflame::Ghostflame(const Reader& reader) :
   radius(100),
   speed(2),
   light(0.0f,0.0f,0.0f),
-  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
   reader.get("radius", radius);
   reader.get("speed", speed);
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   countMe = false;
   //TODO: get unique death sound
-  sound_manager->preload("sounds/fizz.wav");
+  SoundManager::current()->preload("sounds/fizz.wav");
 
   set_colgroup_active(COLGROUP_TOUCHABLE);
 

src/badguy/ghosttree.cpp

@@ -53,10 +53,10 @@ GhostTree::GhostTree(const Reader& lisp) :
   suck_lantern(0),
   willowisps()
 {
-  glow_sprite = sprite_manager->create("images/creatures/ghosttree/ghosttree-glow.sprite");
+  glow_sprite = SpriteManager::current()->create("images/creatures/ghosttree/ghosttree-glow.sprite");
   set_colgroup_active(COLGROUP_TOUCHABLE);
-  sound_manager->preload("sounds/tree_howling.ogg");
-  sound_manager->preload("sounds/tree_suck.ogg");
+  SoundManager::current()->preload("sounds/tree_howling.ogg");
+  SoundManager::current()->preload("sounds/tree_suck.ogg");
 }
 
 GhostTree::~GhostTree()
@@ -93,7 +93,7 @@ GhostTree::active_update(float elapsed_time)
 
   if (mystate == STATE_IDLE) {
     if(colorchange_timer.check()) {
-      sound_manager->play("sounds/tree_howling.ogg", get_pos());
+      SoundManager::current()->play("sounds/tree_howling.ogg", get_pos());
       suck_timer.start(3);
       treecolor = (treecolor + 1) % 3;
 
@@ -112,7 +112,7 @@ GhostTree::active_update(float elapsed_time)
 
     if(suck_timer.check()) {
       Color col = glow_sprite->get_color();
-      sound_manager->play("sounds/tree_suck.ogg", get_pos());
+      SoundManager::current()->play("sounds/tree_suck.ogg", get_pos());
       std::vector<TreeWillOWisp*>::iterator iter;
       for(iter = willowisps.begin(); iter != willowisps.end(); ++iter) {
         TreeWillOWisp *willo = *iter;

src/badguy/goldbomb.cpp

@@ -38,7 +38,7 @@ GoldBomb::GoldBomb(const Reader& reader) :
   max_drop_height = 16;
 
   //Prevent stutter when Tux jumps on Gold Bomb
-  sound_manager->preload("sounds/explosion.wav");
+  SoundManager::current()->preload("sounds/explosion.wav");
 
   //Check if we need another sprite
   if( !reader.get( "sprite", sprite_name ) ){
@@ -49,7 +49,7 @@ GoldBomb::GoldBomb(const Reader& reader) :
     return;
   }
   //Replace sprite
-  sprite = sprite_manager->create( sprite_name );
+  sprite = SpriteManager::current()->create( sprite_name );
 }
 
 void
@@ -114,7 +114,7 @@ GoldBomb::collision_squished(GameObject& object)
     if (player)
       player->bounce(*this);
 
-    ticking = sound_manager->create_sound_source("sounds/fizz.wav");
+    ticking = SoundManager::current()->create_sound_source("sounds/fizz.wav");
     ticking->set_position(get_pos());
     ticking->set_looping(true);
     ticking->set_gain(2.0);

src/badguy/haywire.cpp

@@ -42,7 +42,7 @@ Haywire::Haywire(const Reader& reader) :
   max_drop_height = 16;
 
   //Prevent stutter when Tux jumps on Mr Bomb
-  sound_manager->preload("sounds/explosion.wav");
+  SoundManager::current()->preload("sounds/explosion.wav");
 
   //Check if we need another sprite
   if( !reader.get( "sprite", sprite_name ) ){
@@ -53,7 +53,7 @@ Haywire::Haywire(const Reader& reader) :
     return;
   }
   //Replace sprite
-  sprite = sprite_manager->create( sprite_name );
+  sprite = SpriteManager::current()->create( sprite_name );
 }
 
 HitResponse
@@ -96,12 +96,12 @@ Haywire::collision_squished(GameObject& object)
     time_until_explosion = TIME_EXPLOSION;
     is_exploding = true;
 
-    ticking = sound_manager->create_sound_source("sounds/fizz.wav");
+    ticking = SoundManager::current()->create_sound_source("sounds/fizz.wav");
     ticking->set_position(get_pos());
     ticking->set_looping(true);
     ticking->set_reference_distance(32);
     ticking->play();
-    grunting = sound_manager->create_sound_source("sounds/grunts.ogg");
+    grunting = SoundManager::current()->create_sound_source("sounds/grunts.ogg");
     grunting->set_position(get_pos());
     grunting->set_looping(true);
     grunting->set_reference_distance(32);

src/badguy/iceflame.cpp

@@ -33,14 +33,14 @@ Iceflame::Iceflame(const Reader& reader) :
   radius(100),
   speed(2),
   light(0.0f,0.0f,0.0f),
-  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
   reader.get("radius", radius);
   reader.get("speed", speed);
   bbox.set_pos(Vector(start_position.x + cos(angle) * radius,
                       start_position.y + sin(angle) * radius));
   countMe = false;
-  sound_manager->preload("sounds/sizzle.ogg");
+  SoundManager::current()->preload("sounds/sizzle.ogg");
 
   set_colgroup_active(COLGROUP_TOUCHABLE);
 
@@ -86,7 +86,7 @@ Iceflame::kill_fall()
 void
 Iceflame::ignite()
 {
-  sound_manager->play("sounds/sizzle.ogg", get_pos());
+  SoundManager::current()->play("sounds/sizzle.ogg", get_pos());
   sprite->set_action("fade", 1);
   Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", bbox.get_middle(), ANCHOR_MIDDLE, Vector(0, -150), Vector(0,0), LAYER_BACKGROUNDTILES+2));
   set_group(COLGROUP_DISABLED);

src/badguy/jumpy.cpp

@@ -30,7 +30,7 @@ Jumpy::Jumpy(const Reader& reader) :
   groundhit_pos_set(false)
 {
   // TODO create a nice sound for this...
-  //sound_manager->preload("sounds/skid.wav");
+  //SoundManager::current()->preload("sounds/skid.wav");
 }
 
 void
@@ -57,7 +57,7 @@ Jumpy::hit(const CollisionHit& chit)
 
     physic.set_velocity_y((frozen || get_state() == STATE_FALLING) ? 0 : JUMPYSPEED);
     // TODO create a nice sound for this...
-    //sound_manager->play("sounds/skid.wav");
+    //SoundManager::current()->play("sounds/skid.wav");
   } else if(chit.top) {
     physic.set_velocity_y(0);
   }