From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Wed, 4 Mar 2015 21:49:57 +0000 (+0100)
Subject: better sound for splash effect
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=c4a1129cfccd204f4267f8ee838f95dd6ebad1cc

better sound for splash effect
---

diff --git a/data/AUTHORS b/data/AUTHORS
index b6c32239a..85fe5dc32 100644
--- a/data/AUTHORS
+++ b/data/AUTHORS
@@ -92,6 +92,7 @@ These are just more code.
 * shoot.wav - added Fri May 14 05:24:24 2004 UTC by sik0fewl. Message was "added sounds from Nathan McCoy" -sommer 22:43, 4 Jan 2007 (CET)
 * skid.wav - replaced with a self-made sound by wansti
 * splash.ogg - self-made by WolfgangB GPLv2+CC-by-sa
+* splash.wav - sound created by soundscalpel.com, licensed under CC-by http://freesound.org/people/soundscalpel.com/sounds/110393/
 * squish.wav - replaced with a self-made sound by Some_Person
 * stomp.wav - replaced with a self-made sound by Some_Person
 * switch.ogg - self-made by WolfgangB GPLv2+CC-by-sa
diff --git a/data/sounds/splash.wav b/data/sounds/splash.wav
new file mode 100644
index 000000000..d42954682
Binary files /dev/null and b/data/sounds/splash.wav differ
diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index cc0638eac..888694e0f 100644
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -55,7 +55,7 @@ BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name_, int layer_) :
 
   SoundManager::current()->preload("sounds/squish.wav");
   SoundManager::current()->preload("sounds/fall.wav");
-  SoundManager::current()->preload("sounds/splash.ogg");
+  SoundManager::current()->preload("sounds/splash.wav");
 
   dir = (start_dir == AUTO) ? LEFT : start_dir;
 }
@@ -83,7 +83,7 @@ BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite
 
   SoundManager::current()->preload("sounds/squish.wav");
   SoundManager::current()->preload("sounds/fall.wav");
-  SoundManager::current()->preload("sounds/splash.ogg");
+  SoundManager::current()->preload("sounds/splash.wav");
 
   dir = (start_dir == AUTO) ? LEFT : start_dir;
 }
@@ -118,7 +118,7 @@ BadGuy::BadGuy(const Reader& reader, const std::string& sprite_name_, int layer_
 
   SoundManager::current()->preload("sounds/squish.wav");
   SoundManager::current()->preload("sounds/fall.wav");
-  SoundManager::current()->preload("sounds/splash.ogg");
+  SoundManager::current()->preload("sounds/splash.wav");
 
   dir = (start_dir == AUTO) ? LEFT : start_dir;
 }
@@ -242,7 +242,7 @@ BadGuy::collision_tile(uint32_t tile_attributes)
   if(tile_attributes & Tile::WATER && !is_in_water())
   {
     in_water = true;
-    SoundManager::current()->play("sounds/splash.ogg", get_pos());
+    SoundManager::current()->play("sounds/splash.wav", get_pos());
   }
   if(!(tile_attributes & Tile::WATER) && is_in_water())
   {
diff --git a/src/object/player.cpp b/src/object/player.cpp
index f661134c5..7aa2004d0 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -185,7 +185,7 @@ Player::Player(PlayerStatus* _player_status, const std::string& name_) :
   SoundManager::current()->preload("sounds/skid.wav");
   SoundManager::current()->preload("sounds/flip.wav");
   SoundManager::current()->preload("sounds/invincible_start.ogg");
-  SoundManager::current()->preload("sounds/splash.ogg");
+  SoundManager::current()->preload("sounds/splash.wav");
 
   init();
 }
@@ -1336,7 +1336,7 @@ Player::collision_tile(uint32_t tile_attributes)
     if( tile_attributes & Tile::WATER ){
       swimming = true;
       no_water = false;
-      SoundManager::current()->play( "sounds/splash.ogg" );
+      SoundManager::current()->play( "sounds/splash.wav" );
     }
   }
 #endif