converted all sound files to .ogg (to avoid problems with different sampling rates...

adjusted volume of some music files

SVN-Revision: 2654

diff --git a/data/music/forest.ogg b/data/music/forest.ogg
index 19e4c1e..77ae678 100644 (file)
Binary files a/data/music/forest.ogg and b/data/music/forest.ogg differ

diff --git a/data/music/salcon.ogg b/data/music/salcon.ogg
index 3607d1f..fd67088 100644 (file)
Binary files a/data/music/salcon.ogg and b/data/music/salcon.ogg differ

diff --git a/data/sounds/bigjump.ogg b/data/sounds/bigjump.ogg
new file mode 100644 (file)
index 0000000..eb71e73
Binary files /dev/null and b/data/sounds/bigjump.ogg differ

diff --git a/data/sounds/bigjump.wav b/data/sounds/bigjump.wav
deleted file mode 100644 (file)
index 634d23d..0000000
Binary files a/data/sounds/bigjump.wav and /dev/null differ

diff --git a/data/sounds/brick.ogg b/data/sounds/brick.ogg
new file mode 100644 (file)
index 0000000..2c3afec
Binary files /dev/null and b/data/sounds/brick.ogg differ

diff --git a/data/sounds/brick.wav b/data/sounds/brick.wav
deleted file mode 100644 (file)
index 83de10d..0000000
Binary files a/data/sounds/brick.wav and /dev/null differ

diff --git a/data/sounds/bump-upgrade.ogg b/data/sounds/bump-upgrade.ogg
new file mode 100644 (file)
index 0000000..415180c
Binary files /dev/null and b/data/sounds/bump-upgrade.ogg differ

diff --git a/data/sounds/bump-upgrade.wav b/data/sounds/bump-upgrade.wav
deleted file mode 100644 (file)
index 524b8e2..0000000
Binary files a/data/sounds/bump-upgrade.wav and /dev/null differ

diff --git a/data/sounds/coin.ogg b/data/sounds/coin.ogg
new file mode 100644 (file)
index 0000000..460c6b1
Binary files /dev/null and b/data/sounds/coin.ogg differ

diff --git a/data/sounds/coin.wav b/data/sounds/coin.wav
deleted file mode 100644 (file)
index 40c34d9..0000000
Binary files a/data/sounds/coin.wav and /dev/null differ

diff --git a/data/sounds/explosion.ogg b/data/sounds/explosion.ogg
new file mode 100644 (file)
index 0000000..220fb17
Binary files /dev/null and b/data/sounds/explosion.ogg differ

diff --git a/data/sounds/explosion.wav b/data/sounds/explosion.wav
deleted file mode 100644 (file)
index 259ae1e..0000000
Binary files a/data/sounds/explosion.wav and /dev/null differ

diff --git a/data/sounds/fall.ogg b/data/sounds/fall.ogg
new file mode 100644 (file)
index 0000000..d0bc808
Binary files /dev/null and b/data/sounds/fall.ogg differ

diff --git a/data/sounds/fall.wav b/data/sounds/fall.wav
deleted file mode 100644 (file)
index e48c7a5..0000000
Binary files a/data/sounds/fall.wav and /dev/null differ

diff --git a/data/sounds/fire-flower.ogg b/data/sounds/fire-flower.ogg
new file mode 100644 (file)
index 0000000..c368a72
Binary files /dev/null and b/data/sounds/fire-flower.ogg differ

diff --git a/data/sounds/fire-flower.wav b/data/sounds/fire-flower.wav
deleted file mode 100644 (file)
index 72c2272..0000000
Binary files a/data/sounds/fire-flower.wav and /dev/null differ

diff --git a/data/sounds/fireworks.ogg b/data/sounds/fireworks.ogg
new file mode 100644 (file)
index 0000000..2e02ab7
Binary files /dev/null and b/data/sounds/fireworks.ogg differ

diff --git a/data/sounds/fireworks.wav b/data/sounds/fireworks.wav
deleted file mode 100644 (file)
index d4ea956..0000000
Binary files a/data/sounds/fireworks.wav and /dev/null differ

diff --git a/data/sounds/flame.ogg b/data/sounds/flame.ogg
new file mode 100644 (file)
index 0000000..6d512cc
Binary files /dev/null and b/data/sounds/flame.ogg differ

diff --git a/data/sounds/flame.wav b/data/sounds/flame.wav
deleted file mode 100644 (file)
index 6aeccb1..0000000
Binary files a/data/sounds/flame.wav and /dev/null differ

diff --git a/data/sounds/grow.ogg b/data/sounds/grow.ogg
new file mode 100644 (file)
index 0000000..63a1b25
Binary files /dev/null and b/data/sounds/grow.ogg differ

diff --git a/data/sounds/grow.wav b/data/sounds/grow.wav
deleted file mode 100644 (file)
index 7b83dcc..0000000
Binary files a/data/sounds/grow.wav and /dev/null differ

diff --git a/data/sounds/hurt.ogg b/data/sounds/hurt.ogg
new file mode 100644 (file)
index 0000000..2a79923
Binary files /dev/null and b/data/sounds/hurt.ogg differ

diff --git a/data/sounds/hurt.wav b/data/sounds/hurt.wav
deleted file mode 100644 (file)
index 20537c3..0000000
Binary files a/data/sounds/hurt.wav and /dev/null differ

diff --git a/data/sounds/invincible.ogg b/data/sounds/invincible.ogg
new file mode 100644 (file)
index 0000000..72fd94c
Binary files /dev/null and b/data/sounds/invincible.ogg differ

diff --git a/data/sounds/invincible.wav b/data/sounds/invincible.wav
deleted file mode 100644 (file)
index 96f3871..0000000
Binary files a/data/sounds/invincible.wav and /dev/null differ

diff --git a/data/sounds/jump.ogg b/data/sounds/jump.ogg
new file mode 100644 (file)
index 0000000..c87d6b3
Binary files /dev/null and b/data/sounds/jump.ogg differ

diff --git a/data/sounds/jump.wav b/data/sounds/jump.wav
deleted file mode 100644 (file)
index 24240ea..0000000
Binary files a/data/sounds/jump.wav and /dev/null differ

diff --git a/data/sounds/kick.ogg b/data/sounds/kick.ogg
new file mode 100644 (file)
index 0000000..4062552
Binary files /dev/null and b/data/sounds/kick.ogg differ

diff --git a/data/sounds/kick.wav b/data/sounds/kick.wav
deleted file mode 100644 (file)
index fa46559..0000000
Binary files a/data/sounds/kick.wav and /dev/null differ

diff --git a/data/sounds/lava.ogg b/data/sounds/lava.ogg
new file mode 100644 (file)
index 0000000..8c56745
Binary files /dev/null and b/data/sounds/lava.ogg differ

diff --git a/data/sounds/lava.wav b/data/sounds/lava.wav
deleted file mode 100644 (file)
index 40a24ea..0000000
Binary files a/data/sounds/lava.wav and /dev/null differ

diff --git a/data/sounds/lifeup.ogg b/data/sounds/lifeup.ogg
new file mode 100644 (file)
index 0000000..8499210
Binary files /dev/null and b/data/sounds/lifeup.ogg differ

diff --git a/data/sounds/lifeup.wav b/data/sounds/lifeup.wav
deleted file mode 100644 (file)
index 96f221c..0000000
Binary files a/data/sounds/lifeup.wav and /dev/null differ

diff --git a/data/sounds/phone.ogg b/data/sounds/phone.ogg
new file mode 100644 (file)
index 0000000..3f6bd1e
Binary files /dev/null and b/data/sounds/phone.ogg differ

diff --git a/data/sounds/phone.wav b/data/sounds/phone.wav
deleted file mode 100644 (file)
index c2da218..0000000
Binary files a/data/sounds/phone.wav and /dev/null differ

diff --git a/data/sounds/rain.ogg b/data/sounds/rain.ogg
new file mode 100644 (file)
index 0000000..e806c25
Binary files /dev/null and b/data/sounds/rain.ogg differ

diff --git a/data/sounds/rain.wav b/data/sounds/rain.wav
deleted file mode 100644 (file)
index 7509a53..0000000
Binary files a/data/sounds/rain.wav and /dev/null differ

diff --git a/data/sounds/ricochet.ogg b/data/sounds/ricochet.ogg
new file mode 100644 (file)
index 0000000..9f2abfe
Binary files /dev/null and b/data/sounds/ricochet.ogg differ

diff --git a/data/sounds/ricochet.wav b/data/sounds/ricochet.wav
deleted file mode 100644 (file)
index 016c7bf..0000000
Binary files a/data/sounds/ricochet.wav and /dev/null differ

diff --git a/data/sounds/shoot.ogg b/data/sounds/shoot.ogg
new file mode 100644 (file)
index 0000000..9f026f0
Binary files /dev/null and b/data/sounds/shoot.ogg differ

diff --git a/data/sounds/shoot.wav b/data/sounds/shoot.wav
deleted file mode 100644 (file)
index c30a649..0000000
Binary files a/data/sounds/shoot.wav and /dev/null differ

diff --git a/data/sounds/skid.ogg b/data/sounds/skid.ogg
new file mode 100644 (file)
index 0000000..761a42c
Binary files /dev/null and b/data/sounds/skid.ogg differ

diff --git a/data/sounds/skid.wav b/data/sounds/skid.wav
deleted file mode 100644 (file)
index 8576153..0000000
Binary files a/data/sounds/skid.wav and /dev/null differ

diff --git a/data/sounds/squish.ogg b/data/sounds/squish.ogg
new file mode 100644 (file)
index 0000000..7e8c0ad
Binary files /dev/null and b/data/sounds/squish.ogg differ

diff --git a/data/sounds/squish.wav b/data/sounds/squish.wav
deleted file mode 100644 (file)
index 85601db..0000000
Binary files a/data/sounds/squish.wav and /dev/null differ

diff --git a/data/sounds/stomp.ogg b/data/sounds/stomp.ogg
new file mode 100644 (file)
index 0000000..afa81d1
Binary files /dev/null and b/data/sounds/stomp.ogg differ

diff --git a/data/sounds/stomp.wav b/data/sounds/stomp.wav
deleted file mode 100644 (file)
index ace9b96..0000000
Binary files a/data/sounds/stomp.wav and /dev/null differ

diff --git a/data/sounds/upgrade.ogg b/data/sounds/upgrade.ogg
new file mode 100644 (file)
index 0000000..b35186d
Binary files /dev/null and b/data/sounds/upgrade.ogg differ

diff --git a/data/sounds/upgrade.wav b/data/sounds/upgrade.wav
deleted file mode 100644 (file)
index 95edf47..0000000
Binary files a/data/sounds/upgrade.wav and /dev/null differ

diff --git a/data/sounds/warp.ogg b/data/sounds/warp.ogg
new file mode 100644 (file)
index 0000000..ee2928f
Binary files /dev/null and b/data/sounds/warp.ogg differ

diff --git a/data/sounds/warp.wav b/data/sounds/warp.wav
deleted file mode 100755 (executable)
index 438cee5..0000000
Binary files a/data/sounds/warp.wav and /dev/null differ

diff --git a/data/sounds/waterfall.ogg b/data/sounds/waterfall.ogg
new file mode 100644 (file)
index 0000000..c5a424e
Binary files /dev/null and b/data/sounds/waterfall.ogg differ

diff --git a/data/sounds/waterfall.wav b/data/sounds/waterfall.wav
deleted file mode 100644 (file)
index 52eb8e7..0000000
Binary files a/data/sounds/waterfall.wav and /dev/null differ

diff --git a/data/sounds/yeti_gna.ogg b/data/sounds/yeti_gna.ogg
new file mode 100644 (file)
index 0000000..9c1a2d0
Binary files /dev/null and b/data/sounds/yeti_gna.ogg differ

diff --git a/data/sounds/yeti_gna.wav b/data/sounds/yeti_gna.wav
deleted file mode 100644 (file)
index 423479f..0000000
Binary files a/data/sounds/yeti_gna.wav and /dev/null differ

diff --git a/data/sounds/yeti_roar.ogg b/data/sounds/yeti_roar.ogg
new file mode 100644 (file)
index 0000000..b46819b
Binary files /dev/null and b/data/sounds/yeti_roar.ogg differ

diff --git a/data/sounds/yeti_roar.wav b/data/sounds/yeti_roar.wav
deleted file mode 100644 (file)
index 25d1ccb..0000000
Binary files a/data/sounds/yeti_roar.wav and /dev/null differ

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 8af3885..65b2997 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -181,7 +181,7 @@ BadGuy::collision_squished(Player& )
 void
 BadGuy::kill_squished(Player& player)
 {
-  sound_manager->play("sounds/squish.wav", get_pos());
+  sound_manager->play("sounds/squish.ogg", get_pos());
   physic.enable_gravity(true);
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
@@ -193,7 +193,7 @@ BadGuy::kill_squished(Player& player)
 void
 BadGuy::kill_fall()
 {
-  sound_manager->play("sounds/fall.wav", get_pos());
+  sound_manager->play("sounds/fall.ogg", get_pos());
   global_stats.add_points(BADGUYS_KILLED_STAT, 1);
   physic.set_velocity_y(0);
   physic.enable_gravity(true);

diff --git a/src/badguy/bomb.cpp b/src/badguy/bomb.cpp
index c611337..451fe00 100644 (file)
--- a/src/badguy/bomb.cpp
+++ b/src/badguy/bomb.cpp
@@ -92,7 +92,7 @@ Bomb::explode()
 {
   state = 1;
   sprite->set_action("explosion");
-  sound_manager->play("sounds/explosion.wav", get_pos());
+  sound_manager->play("sounds/explosion.ogg", get_pos());
   timer.start(EXPLOSIONTIME);
 }
 

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index f43b69a..b17cdb5 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -69,7 +69,7 @@ void
 Flame::activate()
 {
   delete source;
-  source = sound_manager->create_sound_source("sounds/flame.wav");
+  source = sound_manager->create_sound_source("sounds/flame.ogg");
   if(!source) {
     std::cerr << "Couldn't start flame sound.\n";
     return;

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 9b2a6b7..9514ed3 100644 (file)
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -70,7 +70,7 @@ Jumpy::hit(const CollisionHit& chit)
     
     physic.set_velocity_y(JUMPSPEED);
     // TODO create a nice sound for this...
-    //sound_manager->play("sounds/skid.wav");
+    //sound_manager->play("sounds/skid.ogg");
   } else if(chit.normal.y < .5) { // bumped on roof
     physic.set_velocity_y(0);
   }

diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index 437f56c..67e9ea4 100644 (file)
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -105,7 +105,7 @@ MrIceBlock::collision_solid(GameObject& object, const CollisionHit& hit)
       dir = dir == LEFT ? RIGHT : LEFT;
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
       physic.set_velocity_x(-physic.get_velocity_x());
-      sound_manager->play("sounds/ricochet.wav", get_pos());
+      sound_manager->play("sounds/iceblock_bump.ogg", get_pos());
       break;
     }
     case ICESTATE_FLAT:
@@ -152,7 +152,7 @@ MrIceBlock::collision_squished(Player& player)
       }
 
       // flatten
-      sound_manager->play("sounds/stomp.wav", get_pos());
+      sound_manager->play("sounds/stomp.ogg", get_pos());
       physic.set_velocity_x(0);
       physic.set_velocity_y(0); 
       
@@ -162,7 +162,7 @@ MrIceBlock::collision_squished(Player& player)
       break;
     case ICESTATE_FLAT:
       // kick
-      sound_manager->play("sounds/kick.wav", get_pos());
+      sound_manager->play("sounds/kick.ogg", get_pos());
 
       if(player.get_pos().x < get_pos().x) {
         dir = RIGHT;

diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp
index 73e2c63..82ec915 100644 (file)
--- a/src/badguy/mrtree.cpp
+++ b/src/badguy/mrtree.cpp
@@ -64,7 +64,7 @@ MrTree::collision_squished(Player& player)
     mystate = STATE_NORMAL;
     activate();
 
-    sound_manager->play("sounds/squish.wav", get_pos());
+    sound_manager->play("sounds/squish.ogg", get_pos());
     player.bounce(*this);
   } else {
     sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");

diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 925e4de..96b745f 100644 (file)
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -147,7 +147,7 @@ Nolok_01::kill_fall()
   bullet_hitpoints--;
   if (bullet_hitpoints <= 0) {
    hitpoints = 0;
-   sound_manager->play("sounds/fall.wav", this,
+   sound_manager->play("sounds/fall.ogg", this,
                              Sector::current()->player->get_pos());
    physic.set_velocity_y(0);
    physic.enable_gravity(true);

diff --git a/src/badguy/rocketexplosion.cpp b/src/badguy/rocketexplosion.cpp
index e79e847..b90c183 100644 (file)
--- a/src/badguy/rocketexplosion.cpp
+++ b/src/badguy/rocketexplosion.cpp
@@ -76,7 +76,7 @@ void
 RocketExplosion::explode()
 {
   sprite->set_action(dir == LEFT ? "explosion-left" : "explosion-right");
-  sound_manager->play("sounds/explosion.wav", get_pos());
+  sound_manager->play("sounds/explosion.ogg", get_pos());
   timer.start(EXPLOSIONTIME, true);
 }
 

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index 50aa888..7e404a3 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -89,7 +89,7 @@ Yeti::active_update(float elapsed_time)
     case ANGRY_JUMPING:
       if(timer.check()) {
         // jump
-        sound_manager->play("sounds/yeti_gna.wav");
+        sound_manager->play("sounds/yeti_gna.ogg");
         physic.set_velocity_y(JUMP_VEL1);
       }
       break;
@@ -141,7 +141,7 @@ Yeti::collision_squished(Player& player)
     return true;
 
   player.bounce(*this);
-  sound_manager->play("sounds/yeti_roar.wav");
+  sound_manager->play("sounds/yeti_roar.ogg");
   hit_points--;
   if(hit_points <= 0) {
     sprite->set_action("dead");

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 68253b0..61af1aa 100644 (file)
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -123,7 +123,7 @@ AmbientSound::start_playing()
   try {
     std::string filename = "sounds/";
     filename += sample;
-    filename += ".wav";
+    filename += ".ogg";
     sound_source = sound_manager->create_sound_source(filename);
     if(!sound_source)
       throw std::runtime_error("file not found");

diff --git a/src/object/block.cpp b/src/object/block.cpp
index d68b02a..dd2e11c 100644 (file)
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -203,7 +203,7 @@ void
 BonusBlock::try_open()
 {
   if(sprite->get_action_name() == "empty") {
-    sound_manager->play("sounds/brick.wav");
+    sound_manager->play("sounds/brick.ogg");
     return;
   }
   
@@ -224,7 +224,7 @@ BonusBlock::try_open()
             get_pos(), new Flower(Flower::FIREFLOWER));
         sector->add_object(riser);
       }
-      sound_manager->play("sounds/upgrade.wav");
+      sound_manager->play("sounds/upgrade.ogg");
       break;
 
     case CONTENT_ICEGROW:
@@ -236,7 +236,7 @@ BonusBlock::try_open()
             get_pos(), new Flower(Flower::ICEFLOWER));
         sector->add_object(riser);
       }      
-      sound_manager->play("sounds/upgrade.wav");
+      sound_manager->play("sounds/upgrade.ogg");
       break;
 
     case CONTENT_STAR:
@@ -251,7 +251,7 @@ BonusBlock::try_open()
       SpecialRiser* riser = new SpecialRiser(get_pos(), object);
       object = 0;
       sector->add_object(riser);
-      sound_manager->play("sounds/upgrade.wav");
+      sound_manager->play("sounds/upgrade.ogg");
       break;
 
     //default:
@@ -292,7 +292,7 @@ Brick::try_break(bool playerhit)
   if(sprite->get_action_name() == "empty")
     return;
   
-  sound_manager->play("sounds/brick.wav");
+  sound_manager->play("sounds/brick.ogg");
   Sector* sector = Sector::current();
   Player& player = *(sector->player);
   if(coin_counter > 0) {

diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
index 62904c5..12b79b3 100644 (file)
--- a/src/object/fireworks.cpp
+++ b/src/object/fireworks.cpp
@@ -51,7 +51,7 @@ Fireworks::update(float )
         sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
                 Vector(0, 0), 45, Color(red, green, 0), 3, 1.3,
                 LAYER_FOREGROUND1+1));
-        sound_manager->play("sounds/fireworks.wav");
+        sound_manager->play("sounds/fireworks.ogg");
         timer.start(((float) rand() / RAND_MAX) + .5);
     }
 }

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index c71ec69..0dbdd38 100644 (file)
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -67,7 +67,7 @@ Flower::collision(GameObject& other, const CollisionHit& )
   else
     player->set_bonus(ICE_BONUS, true);
   
-  sound_manager->play("sounds/fire-flower.wav");
+  sound_manager->play("sounds/fire-flower.ogg");
   remove_me();
   return ABORT_MOVE;
 }

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 6f0fe5e..fd33999 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -64,7 +64,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
     player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play("sounds/grow.wav");
+    sound_manager->play("sounds/grow.ogg");
     remove_me();
     
     return ABORT_MOVE;

diff --git a/src/object/invisible_block.cpp b/src/object/invisible_block.cpp
index 4d28d26..47f17ea 100644 (file)
--- a/src/object/invisible_block.cpp
+++ b/src/object/invisible_block.cpp
@@ -49,7 +49,7 @@ InvisibleBlock::hit(Player& )
     return;
 
   sprite->set_action("empty");
-  sound_manager->play("sounds/brick.wav");
+  sound_manager->play("sounds/brick.ogg");
   start_bounce();
   flags |= FLAG_SOLID;
   visible = true;

diff --git a/src/object/player.cpp b/src/object/player.cpp
index b42c547..961e7a3 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -270,7 +270,7 @@ Player::handle_horizontal_input()
     // let's skid!
     if(fabs(vx)>SKID_XM && !skidding_timer.started()) {
       skidding_timer.start(SKID_TIME);
-      sound_manager->play("sounds/skid.wav");
+      sound_manager->play("sounds/skid.ogg");
       // dust some partcles
       Sector::current()->add_object(
         new Particles(
@@ -366,9 +366,9 @@ Player::handle_vertical_input()
     can_flap = false;
     flaps_nb = 0; // Ricardo's flapping
     if (is_big())
-      sound_manager->play("sounds/bigjump.wav");
+      sound_manager->play("sounds/bigjump.ogg");
     else
-      sound_manager->play("sounds/jump.wav");
+      sound_manager->play("sounds/jump.ogg");
   } else if(!controller->hold(Controller::JUMP)) { // Let go of jump key
     if (!flapping && !duck && !falling_from_flap && !on_ground()) {
       can_flap = true;
@@ -790,7 +790,7 @@ Player::collision(GameObject& other, const CollisionHit& hit)
 void
 Player::make_invincible()
 {
-  sound_manager->play("sounds/invincible.wav");
+  sound_manager->play("sounds/invincible.ogg");
   invincible_timer.start(TUX_INVINCIBLE_TIME);
   Sector::current()->play_music(HERRING_MUSIC);               
 }
@@ -806,7 +806,7 @@ Player::kill(HurtMode mode)
           safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)
     return;                          
   
-  sound_manager->play("sounds/hurt.wav");
+  sound_manager->play("sounds/hurt.ogg");
 
   physic.set_velocity_x(0);
 

diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index 9d3ff93..8cc0e7e 100644 (file)
--- a/src/object/powerup.cpp
+++ b/src/object/powerup.cpp
@@ -74,10 +74,10 @@ PowerUp::collision(GameObject& other, const CollisionHit& hit)
   // some defaults if no script has been set
   if (sprite->get_name() == "egg") {
     player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play("sounds/grow.wav");
+    sound_manager->play("sounds/grow.ogg");
   } else if (sprite->get_name() == "fireflower") {
     player->set_bonus(FIRE_BONUS, true);
-    sound_manager->play("sounds/fire-flower.wav");
+    sound_manager->play("sounds/fire-flower.ogg");
   } else if (sprite->get_name() == "star") {
     player->make_invincible();
   } else if (sprite->get_name() == "1up") {

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 57acb93..cb5815e 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -55,7 +55,7 @@ PlayerStatus::incLives()
 {
   if(lives < MAX_LIVES)
     ++lives;
-  sound_manager->play("sounds/lifeup.wav");
+  sound_manager->play("sounds/lifeup.ogg");
 }
 
 void
@@ -66,7 +66,7 @@ PlayerStatus::incCoins()
     incLives();
     coins = 0;
   }
-  sound_manager->play("sounds/coin.wav");
+  sound_manager->play("sounds/coin.ogg");
 }
 
 void

diff --git a/src/scripting/wrapper.cpp b/src/scripting/wrapper.cpp
index 603f3fd..73e5da6 100644 (file)
--- a/src/scripting/wrapper.cpp
+++ b/src/scripting/wrapper.cpp
@@ -443,7 +443,7 @@ static int import_wrapper(HSQUIRRELVM v)
 {
   HSQUIRRELVM arg0 = v;
   const char* arg1;
-  sq_getstring(v, 4, &arg1);
+  sq_getstring(v, 2, &arg1);
   
   Scripting::import(arg0, arg1);
   

diff --git a/src/sector.cpp b/src/sector.cpp
index 51b8683..4db083f 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -769,7 +769,7 @@ Sector::add_bullet(const Vector& pos, float xm, Direction dir)
   }
   add_object(new_bullet);
 
-  sound_manager->play("sounds/shoot.wav");
+  sound_manager->play("sounds/shoot.ogg");
 
   return true;
 }

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index feb5b88..36e0444 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -713,7 +713,7 @@ WorldMap::update(float delta)
         if (special_tile->teleport_dest != Vector(-1,-1))
           {
           // TODO: an animation, camera scrolling or a fading would be a nice touch
-          sound_manager->play("sounds/warp.wav");
+          sound_manager->play("sounds/warp.ogg");
           tux->back_direction = D_NONE;
           tux->set_tile_pos(special_tile->teleport_dest);
           SDL_Delay(1000);