Remove extension from sound samples.

SDL can figure out the file type on its own, this allows us to change sample
formats without having to change the source code as well.

diff --git a/data/arcticWastes b/data/arcticWastes
index 58987d2a9c91387eb8c604e9ec09948ff8e9f69a..a98939016a4e3f2ebcae614debf562a60a3c1ddc 100644 (file)
--- a/data/arcticWastes
+++ b/data/arcticWastes
@@ -304,7 +304,7 @@ EMH TILESET gfx/arctic
 EMH BACKGROUND gfx/arctic/wasteland.png
 EMH MUSIC music/arctic
 
-EMH AMBIENCE sound/blizzard.wav
+EMH AMBIENCE sound/blizzard
 
 EMH CLIPPING -1 -1 7616 -1
 

diff --git a/data/caves1 b/data/caves1
index 9cfc3aea1b36ac8bc7053245d86a375e9aa9d0f9..1ed8078bcdac0f2ac1807b2af7dfabac13a48946 100644 (file)
--- a/data/caves1
+++ b/data/caves1
@@ -305,7 +305,7 @@ EMH TILESET gfx/caves
 EMH BACKGROUND gfx/caves/background.jpg
 EMH MUSIC music/cave
 
-EMH AMBIENCE sound/lava.wav
+EMH AMBIENCE sound/lava
 
 EMH ALPHATILES 245 246 247 -1
 

diff --git a/data/caves2 b/data/caves2
index b9790c42f4f8f6defa802337646056089794b03d..c710e7b6b2616e5987c55c5f45a461e48b64931c 100644 (file)
--- a/data/caves2
+++ b/data/caves2
@@ -304,7 +304,7 @@ EMH STAGENAME "Inner Cave Network, Part 2"
 EMH TILESET gfx/caves
 EMH BACKGROUND gfx/caves/background.jpg
 EMH MUSIC music/cave
-EMH AMBIENCE sound/lava.wav
+EMH AMBIENCE sound/lava
 
 EMH ALPHATILES 245 246 247 -1
 

diff --git a/data/caves3 b/data/caves3
index 59ec9bfbddbf803c8f4b6207add165c8c0945eff..01b9b076615421053d87c359b2200aba44a12c8f 100644 (file)
--- a/data/caves3
+++ b/data/caves3
@@ -303,7 +303,7 @@ EMH STAGENAME "Forgotten Caves"
 EMH TILESET gfx/caves
 EMH BACKGROUND gfx/caves/background.jpg
 EMH MUSIC music/cave
-EMH AMBIENCE sound/lava.wav
+EMH AMBIENCE sound/lava
 
 EMH START 75 50
 

diff --git a/data/caves4 b/data/caves4
index d5364082197d427fcee6d3ccd6a1a515b61a3619..30246acd01f7c09ddf9876707f1ead7f5025d20a 100644 (file)
--- a/data/caves4
+++ b/data/caves4
@@ -303,7 +303,7 @@ EMH STAGENAME "Uncharted Cavern"
 EMH TILESET gfx/caves
 EMH BACKGROUND gfx/caves/background.jpg
 EMH MUSIC music/cave
-EMH AMBIENCE sound/lava.wav
+EMH AMBIENCE sound/lava
 
 EMH START 5664 4160
 

diff --git a/data/floodedTunnel1 b/data/floodedTunnel1
index 43b738c19e528a5668a3598b84a02f2e2709f0a6..b78daef61a830afece6142af3532a00b1db28814 100644 (file)
--- a/data/floodedTunnel1
+++ b/data/floodedTunnel1
@@ -304,7 +304,7 @@ EMH STAGENAME "Flooded Tunnel"
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/stone.jpg
 EMH MUSIC music/tunnel
-EMH AMBIENCE sound/floodedTunnel.wav
+EMH AMBIENCE sound/floodedTunnel
 
 EMH SPRITE PowerGen 0 0 0 gfx/sprites/powerGen1.png 10 gfx/sprites/powerGen2.png 10 gfx/sprites/powerGen3.png 10 gfx/sprites/powerGen2.png 10 gfx/sprites/powerGen1.png 10 @none@ 0
 EMH SPRITE Dynamite 0 0 0 gfx/sprites/dynamite.png 60 @none@ 0

diff --git a/data/floodedTunnel2 b/data/floodedTunnel2
index 12ea8ec188a114efb319faa9e62475a737238935..25c0ecfe9e0d4c5dcce0ecc44dcf0cb98daa663c 100644 (file)
--- a/data/floodedTunnel2
+++ b/data/floodedTunnel2
@@ -304,7 +304,7 @@ EMH STAGENAME "Flooded Tunnel #2"
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/stone.jpg
 EMH MUSIC music/tunnel
-EMH AMBIENCE sound/floodedTunnel.wav
+EMH AMBIENCE sound/floodedTunnel
 
 EMH ALPHATILES 244 245 246 -1
 

diff --git a/data/floodedTunnel3 b/data/floodedTunnel3
index e4bb444684c28326309690d04e2c4babce2c43cf..83a01232bffe40278e353cb40ca6c6f4c7a9a5a4 100644 (file)
--- a/data/floodedTunnel3
+++ b/data/floodedTunnel3
@@ -303,7 +303,7 @@ EMH STAGENAME "Flooded Tunnel #3"
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/stone.jpg
 EMH MUSIC music/tunnel
-EMH AMBIENCE sound/floodedTunnel.wav
+EMH AMBIENCE sound/floodedTunnel
 EMH ALPHATILES 1 2 3 200 201 202 203 204 244 245 246 -1
 
 EMH SPRITE Spike 0 0 0 gfx/sprites/spike.png 60 @none@ 60

diff --git a/data/floodedTunnel4 b/data/floodedTunnel4
index de7f538a1b7b6fdb873c42a7846a047bd7acd6d0..06bcf9a94487cc22bfdc85e9a8f52af15cfe531f 100644 (file)
--- a/data/floodedTunnel4
+++ b/data/floodedTunnel4
@@ -303,7 +303,7 @@ EMH STAGENAME "Flooded Tunnel #4"
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/stone.jpg
 EMH MUSIC music/tunnel
-EMH AMBIENCE sound/floodedTunnel.wav
+EMH AMBIENCE sound/floodedTunnel
 
 EMH SPRITE Dynamite 0 0 0 gfx/sprites/dynamite.png 60 @none@ 0
 EMH SPRITE Cog 0 0 0 gfx/sprites/ancientCog.png 60 @none@ 0

diff --git a/src/droidBoss.cpp b/src/droidBoss.cpp
index da6b9fb680e6ad8949b18fe7cfab59b552ec29e0..e468c29a9e056571a507ff72d44fcd8faabad715 100644 (file)
--- a/src/droidBoss.cpp
+++ b/src/droidBoss.cpp
@@ -397,8 +397,8 @@ void droidBossInit()
                Math::addBit(&map.boss[i]->flags, ENT_FLIES);
        }
        
-       audio.loadSound(SND_BOSSCUSTOM1, "sound/droidChangeFreq.wav");
-       audio.loadSound(SND_BOSSCUSTOM2, "sound/droidFreakOut.wav");
+       audio.loadSound(SND_BOSSCUSTOM1, "sound/droidChangeFreq");
+       audio.loadSound(SND_BOSSCUSTOM2, "sound/droidFreakOut");
        
        debug(("droidBossInit: Done\n"));
 }

diff --git a/src/finalBattle.cpp b/src/finalBattle.cpp
index 197862b3d6ca2f1cf4ea1452c0d32181c1daa1f3..27149fb131c7b8e618a978ec5e3ce721879f107c 100644 (file)
--- a/src/finalBattle.cpp
+++ b/src/finalBattle.cpp
@@ -574,9 +574,9 @@ void galdovFinalInit()
        map.boss[0]->die = &galdovFinalDie;
        Math::addBit(&map.boss[0]->flags, ENT_AIMS);
        
-       audio.loadSound(SND_BOSSCUSTOM1, "sound/galdovSplit.wav");
-       audio.loadSound(SND_BOSSCUSTOM2, "sound/galdovPain.wav");
-       audio.loadSound(SND_BOSSCUSTOM3, "sound/galdovDie.wav");
+       audio.loadSound(SND_BOSSCUSTOM1, "sound/galdovSplit");
+       audio.loadSound(SND_BOSSCUSTOM2, "sound/galdovPain");
+       audio.loadSound(SND_BOSSCUSTOM3, "sound/galdovDie");
        
        map.setMainBossPart(map.boss[0]);
        

diff --git a/src/galdov.cpp b/src/galdov.cpp
index fa491dc2720be1e723b55a480f8c54fff0fdd7cf..1661354c6c20de2b587a8dd9cb4ea55264ae0d0e 100644 (file)
--- a/src/galdov.cpp
+++ b/src/galdov.cpp
@@ -492,8 +492,8 @@ void galdovInit()
        
        map.setMainBossPart(map.boss[0]);
        
-       audio.loadSound(SND_BOSSCUSTOM1, "sound/galdovSplit.wav");
-       audio.loadSound(SND_BOSSCUSTOM2, "sound/galdovPain.wav");
+       audio.loadSound(SND_BOSSCUSTOM1, "sound/galdovSplit");
+       audio.loadSound(SND_BOSSCUSTOM2, "sound/galdovPain");
        
        debug(("galdovInit: Done\n"));
 }

diff --git a/src/hub.cpp b/src/hub.cpp
index 4233fa98cdd2887322a621f8937f28b766f505fc..ff5c1d8ffa02bb1345b672dd61a1a41fbd55dfb5 100644 (file)
--- a/src/hub.cpp
+++ b/src/hub.cpp
@@ -443,7 +443,7 @@ int doHub()
        audio.loadMusic("music/hub");
        
        // we might want this now, for medals
-       audio.loadSound(SND_ITEM, "sound/item.wav");
+       audio.loadSound(SND_ITEM, "sound/item");
        
        graphics.quickSprite("cheatHeader", graphics.loadImage("gfx/main/cheats.png"));
        graphics.quickSprite("optionsHeader", graphics.loadImage("gfx/main/options.png"));

diff --git a/src/init.cpp b/src/init.cpp
index 7fe79c0717e1e2e7388ea3b9898ab424601b0ce5..861af140aa8795a5151c1f972b698fbd644edef8 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -360,8 +360,8 @@ void initSystem()
        debug(("Font sizes all loaded!!\n"));
 
        audio.loadSound(SND_CHEAT, "sound/Lock And Load!!!");
-       audio.loadSound(SND_HIGHLIGHT, "sound/menu.wav");
-       audio.loadSound(SND_SELECT, "sound/select.wav");
+       audio.loadSound(SND_HIGHLIGHT, "sound/menu");
+       audio.loadSound(SND_SELECT, "sound/select");
        
        graphics.medal[0] = graphics.loadImage("gfx/main/medal_bronze_1.png");
        graphics.medal[1] = graphics.loadImage("gfx/main/award_star_silver_3.png");

diff --git a/src/mission.cpp b/src/mission.cpp
index 1a7934f692649420b51bb04e5f5b7fa93390f8bc..f3403124b35e8ffa32e3ebefbc0ccc0bcd35806a 100644 (file)
--- a/src/mission.cpp
+++ b/src/mission.cpp
@@ -167,8 +167,8 @@ void showMissionClear()
 
        graphics.blit(panel, (640 - panel->w) / 2, (480 - panel->h) / 2, graphics.background, false);
 
-       audio.loadSound(0, "sound/pop1.wav");
-       audio.loadSound(1, "sound/cheer.wav");
+       audio.loadSound(0, "sound/pop1");
+       audio.loadSound(1, "sound/cheer");
 
        SDL_FillRect(graphics.screen, NULL, graphics.black);
        graphics.updateScreen();

diff --git a/src/resources.cpp b/src/resources.cpp
index 5308eff6d587fa0057645b092fd925567a7bb106..32502aacc8c83dd2e9132629bec76d548185b972 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -98,48 +98,48 @@ void loadResources()
                graphics.showLoading(1, 20);
        }
 
-       loadSound(SND_WATERIN, "sound/waterIn.wav");
-       loadSound(SND_WATEROUT, "sound/waterOut.wav");
-       loadSound(SND_ITEM, "sound/item.wav");
-       loadSound(SND_PISTOL, "sound/pistol.wav");
-       loadSound(SND_RICO1, "sound/rico1.wav");
-       loadSound(SND_RICO2, "sound/rico2.wav");
-       loadSound(SND_MACHINEGUN, "sound/machinegun.wav");
-       loadSound(SND_DEATH1, "sound/death1.wav");
-       loadSound(SND_DEATH2, "sound/death2.wav");
-       loadSound(SND_DEATH3, "sound/death3.wav");
-       loadSound(SND_GRENADE, "sound/grenade.wav");
-       loadSound(SND_ROCKET, "sound/rocket.wav");
-       loadSound(SND_FIREBALL, "sound/fireball.wav");
-       loadSound(SND_HIT, "sound/punch.wav");
-       loadSound(SND_SPLAT, "sound/splat.wav");
-       loadSound(SND_POP, "sound/pop1.wav");
-       loadSound(SND_TELEPORT1, "sound/teleport1.wav");
-       loadSound(SND_TELEPORT2, "sound/teleport2.wav");
-       loadSound(SND_TELEPORT3, "sound/teleport3.wav");
-       loadSound(SND_GETWEAPON, "sound/weaponPickup.wav");
-       loadSound(SND_LASER, "sound/laser.wav");
-       loadSound(SND_ELECDEATH1, "sound/elecDeath1.wav");
-       loadSound(SND_ELECDEATH2, "sound/elecDeath2.wav");
-       loadSound(SND_ELECDEATH3, "sound/elecDeath3.wav");
-       loadSound(SND_LOCKEDDOOR, "sound/doorLocked.wav");
-       loadSound(SND_OPENDOOR, "sound/doorOpen.wav");
-       loadSound(SND_DOOROPENED, "sound/doorOpened.wav");
-       loadSound(SND_SWITCH1, "sound/switch.wav");
-       loadSound(SND_SWITCH2, "sound/switch.wav");
-       loadSound(SND_DROWNING, "sound/drowning.wav");
-       loadSound(SND_GULP, "sound/gulp.wav");
-       loadSound(SND_EAT, "sound/eat.wav");
-       loadSound(SND_THROW, "sound/throw.wav");
-       loadSound(SND_GRBOUNCE, "sound/grenadeBounce.wav");
-       loadSound(SND_SPREADGUN, "sound/plasma.wav");
-       loadSound(SND_STONEBREAK, "sound/stoneBreak.wav");
-       loadSound(SND_ELECTRICITY1, "sound/electricity1.wav");
-       loadSound(SND_ELECTRICITY2, "sound/electricity2.wav");
-       loadSound(SND_ELECTRICITY3, "sound/electricity3.wav");
-       loadSound(SND_CLANG, "sound/clang.wav");
-       loadSound(SND_FIRECRACKLE, "sound/fireCrackle.wav");
-       loadSound(SND_CLOCK, "sound/clock.wav");
+       loadSound(SND_WATERIN, "sound/waterIn");
+       loadSound(SND_WATEROUT, "sound/waterOut");
+       loadSound(SND_ITEM, "sound/item");
+       loadSound(SND_PISTOL, "sound/pistol");
+       loadSound(SND_RICO1, "sound/rico1");
+       loadSound(SND_RICO2, "sound/rico2");
+       loadSound(SND_MACHINEGUN, "sound/machinegun");
+       loadSound(SND_DEATH1, "sound/death1");
+       loadSound(SND_DEATH2, "sound/death2");
+       loadSound(SND_DEATH3, "sound/death3");
+       loadSound(SND_GRENADE, "sound/grenade");
+       loadSound(SND_ROCKET, "sound/rocket");
+       loadSound(SND_FIREBALL, "sound/fireball");
+       loadSound(SND_HIT, "sound/punch");
+       loadSound(SND_SPLAT, "sound/splat");
+       loadSound(SND_POP, "sound/pop1");
+       loadSound(SND_TELEPORT1, "sound/teleport1");
+       loadSound(SND_TELEPORT2, "sound/teleport2");
+       loadSound(SND_TELEPORT3, "sound/teleport3");
+       loadSound(SND_GETWEAPON, "sound/weaponPickup");
+       loadSound(SND_LASER, "sound/laser");
+       loadSound(SND_ELECDEATH1, "sound/elecDeath1");
+       loadSound(SND_ELECDEATH2, "sound/elecDeath2");
+       loadSound(SND_ELECDEATH3, "sound/elecDeath3");
+       loadSound(SND_LOCKEDDOOR, "sound/doorLocked");
+       loadSound(SND_OPENDOOR, "sound/doorOpen");
+       loadSound(SND_DOOROPENED, "sound/doorOpened");
+       loadSound(SND_SWITCH1, "sound/switch");
+       loadSound(SND_SWITCH2, "sound/switch");
+       loadSound(SND_DROWNING, "sound/drowning");
+       loadSound(SND_GULP, "sound/gulp");
+       loadSound(SND_EAT, "sound/eat");
+       loadSound(SND_THROW, "sound/throw");
+       loadSound(SND_GRBOUNCE, "sound/grenadeBounce");
+       loadSound(SND_SPREADGUN, "sound/plasma");
+       loadSound(SND_STONEBREAK, "sound/stoneBreak");
+       loadSound(SND_ELECTRICITY1, "sound/electricity1");
+       loadSound(SND_ELECTRICITY2, "sound/electricity2");
+       loadSound(SND_ELECTRICITY3, "sound/electricity3");
+       loadSound(SND_CLANG, "sound/clang");
+       loadSound(SND_FIRECRACKLE, "sound/fireCrackle");
+       loadSound(SND_CLOCK, "sound/clock");
 
        loadDefWeapons();
 

diff --git a/src/tankBoss.cpp b/src/tankBoss.cpp
index 522e67a479d9bf6876c9a633074fbdd1ab4ed6a3..ec291d1266ca6799132764f1f1c2ebdf0313197e 100644 (file)
--- a/src/tankBoss.cpp
+++ b/src/tankBoss.cpp
@@ -399,8 +399,8 @@ void tankBossMGInit()
        map.boss[0]->die = &tankBossMGDie;
        Math::addBit(&map.boss[0]->flags, ENT_AIMS);
        
-       audio.loadSound(SND_BOSSCUSTOM1, "sound/tankBeam.wav");
-       audio.loadSound(SND_BOSSCUSTOM2, "sound/tankBeamFire.wav");
+       audio.loadSound(SND_BOSSCUSTOM1, "sound/tankBeam");
+       audio.loadSound(SND_BOSSCUSTOM2, "sound/tankBeamFire");
        
        map.setMainBossPart(map.boss[0]);