Replace music filenames with generic filenames.

diff --git a/data/arcticWastes b/data/arcticWastes
index ccb29b0a536a45d9dfd340454f7282332eb76d07..58987d2a9c91387eb8c604e9ec09948ff8e9f69a 100644 (file)
--- a/data/arcticWastes
+++ b/data/arcticWastes
@@ -302,7 +302,7 @@
 EMH STAGENAME "Arctic Wastes"
 EMH TILESET gfx/arctic
 EMH BACKGROUND gfx/arctic/wasteland.png
-EMH MUSIC music/cosmicMotion.xm
+EMH MUSIC music/arctic
 
 EMH AMBIENCE sound/blizzard.wav
 

diff --git a/data/assimilator b/data/assimilator
index 4f496e6d5e49d80bafda111cb9e283dbd7f14f03..0a3405fc5d591c7a7e7bcf52a60bbe91006c6749 100644 (file)
--- a/data/assimilator
+++ b/data/assimilator
@@ -304,7 +304,7 @@ EMH STAGENAME "BioMech Assimilator"
 EMH TILESET gfx/mech
 EMH ALPHATILES 221 222 223 224 -1
 EMH BACKGROUND gfx/mech/bossBackground.png
-EMH MUSIC music/condomCorruption.mod
+EMH MUSIC music/biomech
 
 EMH ALPHATILES 1 2 3 200 201 202 203 204 214 215 216 217 218 219 -1
 

diff --git a/data/caves1 b/data/caves1
index eedee8eab98654728e35f6cea29418d9e96da3ba..9cfc3aea1b36ac8bc7053245d86a375e9aa9d0f9 100644 (file)
--- a/data/caves1
+++ b/data/caves1
@@ -303,7 +303,7 @@ EMH STAGENAME "Inner Cave Network, Part 1"
 
 EMH TILESET gfx/caves
 EMH BACKGROUND gfx/caves/background.jpg
-EMH MUSIC music/thugLive.mod
+EMH MUSIC music/cave
 
 EMH AMBIENCE sound/lava.wav
 

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

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

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

diff --git a/data/comm b/data/comm
index 46b37c29e7180898378e08df87395dc4e625cf3a..3c87e9d8403a16044ca442515125153ad52ce78b 100644 (file)
--- a/data/comm
+++ b/data/comm
@@ -304,7 +304,7 @@ EMH STAGENAME "BioMech Communications"
 EMH TILESET gfx/mech
 EMH ALPHATILES 221 222 223 224 -1
 EMH BACKGROUND gfx/mech/bossBackground.png
-EMH MUSIC music/condomCorruption.mod
+EMH MUSIC music/biomech
 
 EMH START 64 224
 

diff --git a/data/finalBattle b/data/finalBattle
index 5e2fa748e1a3b96494b0d5fa447f6d6aeba1484d..b4e4bb0b6b36e948a9b6ec373e4e803f308dc5a2 100644 (file)
--- a/data/finalBattle
+++ b/data/finalBattle
@@ -305,7 +305,7 @@ EMH TILESET gfx/mech
 
 EMH BACKGROUND gfx/mech/space.png
 
-EMH MUSIC music/circuitOverlode.xm
+EMH MUSIC music/final
 
 EMH ALPHATILES -1
 

diff --git a/data/floodedTunnel1 b/data/floodedTunnel1
index f61ae5e4d8204ad04a703bb2872daf76e37fc396..43b738c19e528a5668a3598b84a02f2e2709f0a6 100644 (file)
--- a/data/floodedTunnel1
+++ b/data/floodedTunnel1
@@ -303,7 +303,7 @@ EMH STAGENAME "Flooded Tunnel"
 
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/stone.jpg
-EMH MUSIC music/viking.mod
+EMH MUSIC music/tunnel
 EMH AMBIENCE sound/floodedTunnel.wav
 
 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

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

diff --git a/data/floodedTunnel3 b/data/floodedTunnel3
index c4a19729322eed111bdf2b72beb17be5bcc90eb9..e4bb444684c28326309690d04e2c4babce2c43cf 100644 (file)
--- a/data/floodedTunnel3
+++ b/data/floodedTunnel3
@@ -302,7 +302,7 @@
 EMH STAGENAME "Flooded Tunnel #3"
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/stone.jpg
-EMH MUSIC music/viking.mod
+EMH MUSIC music/tunnel
 EMH AMBIENCE sound/floodedTunnel.wav
 EMH ALPHATILES 1 2 3 200 201 202 203 204 244 245 246 -1
 

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

diff --git a/data/grasslands1 b/data/grasslands1
index 17cc0759961ba5273ef82c0aef28c0990aa00754..4fe043a783b4e9136d3772573b54a7d6b9d69355 100644 (file)
--- a/data/grasslands1
+++ b/data/grasslands1
@@ -304,7 +304,7 @@ EMH STAGENAME "Grasslands"
 EMH TILESET gfx/grasslands
 EMH ALPHATILES 244 245 246 -1
 EMH BACKGROUND gfx/grasslands/day.jpg
-EMH MUSIC music/commando.xm
+EMH MUSIC music/grasslands
 
 EMH SPRITE Transmitter 0 0 0 gfx/sprites/transmitter1.png 5 gfx/sprites/transmitter2.png 5 gfx/sprites/transmitter3.png 5 gfx/sprites/transmitter4.png 5 gfx/sprites/transmitter5.png 5 gfx/sprites/transmitter6.png 120 @none@ 0
 

diff --git a/data/grasslands2 b/data/grasslands2
index 1be1eca24b8e10d55db598e060d53476db971f0a..8ba69212d01654a7eb3ac57dec091fca438f3c10 100644 (file)
--- a/data/grasslands2
+++ b/data/grasslands2
@@ -303,7 +303,7 @@ EMH STAGENAME "Grasslands #2"
 
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/day.jpg
-EMH MUSIC music/commando.xm
+EMH MUSIC music/grasslands
 EMH ALPHATILES 244 245 246 -1
 
 EMH START 5820 4060

diff --git a/data/grasslands3 b/data/grasslands3
index d933c9f9ed477051d27eb9cef6db51da505d1a54..f84b1dbb7815a58826188aeddde353c7bfafbbc3 100644 (file)
--- a/data/grasslands3
+++ b/data/grasslands3
@@ -302,7 +302,7 @@
 EMH STAGENAME "Grasslands #3"
 EMH TILESET gfx/grasslands
 EMH BACKGROUND gfx/grasslands/day.jpg
-EMH MUSIC music/commando.xm
+EMH MUSIC music/grasslands
 
 EMH SPRITE CherryPlant 0 0 0 gfx/sprites/cherryPlant.png 60 @none@ 0
 MH SPRITE LRTS 0 0 0 gfx/sprites/LRTS1.png 15 gfx/sprites/LRTS2.png 15 gfx/sprites/LRTS3.png 15 gfx/sprites/LRTS4.png 15 gfx/sprites/LRTS5.png 15 gfx/sprites/LRTS4.png 15 gfx/sprites/LRTS3.png 15 gfx/sprites/LRTS2.png 15 @none@ 0

diff --git a/data/hq b/data/hq
index f97b715e24e9df0f053112e9212efa7e4b908fbc..95b0b48fe35ca4a1fb5385689971385074a09abf 100644 (file)
--- a/data/hq
+++ b/data/hq
@@ -303,7 +303,7 @@ EMH STAGENAME "BioMech HQ"
 
 EMH TILESET gfx/mech
 EMH BACKGROUND gfx/mech/bossBackground.png
-EMH MUSIC music/condomCorruption.mod
+EMH MUSIC music/biomech
 
 EMH ALPHATILES 221 222 223 224 -1
 

diff --git a/data/icecave1 b/data/icecave1
index 4a2bfd735bbaadb3e274f624b7df3be398615750..921bf8b399841bf9548a2d692e7dc17029de296b 100644 (file)
--- a/data/icecave1
+++ b/data/icecave1
@@ -302,7 +302,7 @@
 EMH STAGENAME "Ice Cave #1"
 EMH TILESET gfx/arctic
 EMH BACKGROUND gfx/arctic/icecave.png
-EMH MUSIC music/iceCave.s3m
+EMH MUSIC music/ice
 
 EMH SPRITE IceBlock 0 0 0 gfx/sprites/iceRock.png 60 @none@ 0
 EMH SPRITE AncientKey 0 0 0 gfx/sprites/ancientKey1.png 10 gfx/sprites/ancientKey2.png 10 gfx/sprites/ancientKey3.png 10 gfx/sprites/ancientKey4.png 10 gfx/sprites/ancientKey5.png 10 gfx/sprites/ancientKey6.png 10 @none@ 0

diff --git a/data/icecave2 b/data/icecave2
index bb21cfce15cd415b1f066580003fafeba5058d39..ed1d6b47181a6cb70e8f353f99cb73645099f2d3 100644 (file)
--- a/data/icecave2
+++ b/data/icecave2
@@ -302,7 +302,7 @@
 EMH STAGENAME "Ice Cave #2"
 EMH TILESET gfx/arctic
 EMH BACKGROUND gfx/arctic/icecave.png
-EMH MUSIC music/iceCave.s3m
+EMH MUSIC music/ice
 
 EMH CLIPPING 1568 9152 7808 -1
 

diff --git a/data/practice b/data/practice
index 81cb213df01c737e95b7958ac50350e681122a16..4cd6a85fa3020fa737ac7d2c25c5e5c727a97fe4 100644 (file)
--- a/data/practice
+++ b/data/practice
@@ -304,7 +304,7 @@ EMH STAGENAME "Training Mission"
 EMH TILESET gfx/grasslands
 EMH ALPHATILES 244 245 246 -1
 EMH BACKGROUND gfx/grasslands/day.jpg
-EMH MUSIC music/commando.xm
+EMH MUSIC music/grasslands
 
 EMH CLIPPING 1770 8928 8000 -1
 

diff --git a/data/spaceStation b/data/spaceStation
index 4355f6f3e3a01b388f172f33c37b04621b884004..8d14722fa6704181b90443a04237e03252eb4c4a 100644 (file)
--- a/data/spaceStation
+++ b/data/spaceStation
@@ -302,7 +302,7 @@
 EMH STAGENAME "Space Station"
 EMH TILESET gfx/mech
 EMH BACKGROUND gfx/mech/space.png
-EMH MUSIC music/iceWorld.s3m
+EMH MUSIC music/space
 
 EMH ALPHATILES 221 222 223 224 -1
 

diff --git a/data/supply b/data/supply
index 5671905780d719f00c281e9fe4a9e9f08b2407d4..79276aae65767b4caf178bac6697a823635c55fe 100644 (file)
--- a/data/supply
+++ b/data/supply
@@ -304,7 +304,7 @@ EMH STAGENAME "BioMech Supply Depot"
 EMH TILESET gfx/mech
 EMH ALPHATILES 221 222 223 224 -1
 EMH BACKGROUND gfx/mech/bossBackground.png
-EMH MUSIC music/condomCorruption.mod
+EMH MUSIC music/biomech
 
 EMH CLIPPING 256 448 8000 8160
 

diff --git a/data/tomb1 b/data/tomb1
index bb6f314fe5999c97617c848f81de15fed5c91fbd..d71470991e97f47eac5bfb623dc465ce028740db 100644 (file)
--- a/data/tomb1
+++ b/data/tomb1
@@ -305,7 +305,7 @@ EMH TILESET gfx/ancient
 
 EMH BACKGROUND gfx/ancient/background.jpg
 
-EMH MUSIC music/mustDie.s3m
+EMH MUSIC music/tomb
 
 EMH ALPHATILES 1 2 3 200 201 202 203 204 214 215 216 217 218 219 -1
 

diff --git a/data/tomb2 b/data/tomb2
index 9fa4cd859814282246c22083d4b1cabf502e6f68..13a152c579f56e0e22f430821679f7ebf15cf8cc 100644 (file)
--- a/data/tomb2
+++ b/data/tomb2
@@ -305,7 +305,7 @@ EMH TILESET gfx/ancient
 
 EMH BACKGROUND gfx/ancient/background.jpg
 
-EMH MUSIC music/mustDie.s3m
+EMH MUSIC music/tomb
 
 EMH ALPHATILES -1
 

diff --git a/data/tomb3 b/data/tomb3
index 3f8fe371d34a19f63be3d099cdc58c277824c59a..8d92c39d2f7b61c9bf7529c325917613511e1f6e 100644 (file)
--- a/data/tomb3
+++ b/data/tomb3
@@ -305,7 +305,7 @@ EMH TILESET gfx/ancient
 
 EMH BACKGROUND gfx/ancient/background.jpg
 
-EMH MUSIC music/mustDie.s3m
+EMH MUSIC music/tomb
 
 EMH START 64 4320
 

diff --git a/data/tomb4 b/data/tomb4
index 5b1d31299dd24f9280f4829074f07b66b769a3ac..ec6b3a058a2227babb6be11c62ca5fb969ca1c90 100644 (file)
--- a/data/tomb4
+++ b/data/tomb4
@@ -306,7 +306,7 @@ EMH TILESET gfx/ancient
 
 EMH BACKGROUND gfx/ancient/background.jpg
 
-EMH MUSIC music/mustDie.s3m
+EMH MUSIC music/tomb
 
 EMH START 12064 160
 

diff --git a/src/CAudio.cpp b/src/CAudio.cpp
index c985f5e3c92de3e95827f68fcbe4b3d682f94d26..bac32efe78f571410c6cfc8c650ce4a02f1d43d3 100644 (file)
--- a/src/CAudio.cpp
+++ b/src/CAudio.cpp
@@ -202,10 +202,10 @@ bool Audio::loadGameOverMusic()
        }
 
        #if USEPAK
-               engine->unpack("music/friendDied.mod", PAK_MUSIC);
+               engine->unpack("music/gameover", PAK_MUSIC);
                music = Mix_LoadMUS(tempPath);
        #else
-               music = Mix_LoadMUS("music/friendDied.mod");
+               music = Mix_LoadMUS("music/gameover");
        #endif
 
        if (!music)

diff --git a/src/cutscene.cpp b/src/cutscene.cpp
index 354284257f8647ff7a10db73cb1f2d20321425f6..86577672d354b4f1132ca9bae2f8fd239716b48a 100644 (file)
--- a/src/cutscene.cpp
+++ b/src/cutscene.cpp
@@ -216,7 +216,7 @@ void checkStartCutscene()
                return;
        }
        
-       audio.loadMusic("music/daisyChain2.mod");
+       audio.loadMusic("music/cutscene");
        
        char sceneName[1024];
        snprintf(sceneName, sizeof sceneName, "%s Start", game.stageName);
@@ -240,11 +240,11 @@ void checkEndCutscene()
        
        if (strcmp(game.stageName, "Final Battle") != 0)
        {
-               audio.loadMusic("music/daisyChain2.mod");
+               audio.loadMusic("music/cutscene");
        }
        else
        {
-               audio.loadMusic("music/sweetDreams.xm");
+               audio.loadMusic("music/end");
        }
        
        char sceneName[1024];
@@ -275,7 +275,7 @@ void easyGameFinished()
        graphics.free();
        audio.free();
        
-       audio.loadMusic("music/friendDied.mod");
+       audio.loadMusic("music/gameover");
        setupScene("Easy Game Finished");
        showScene(true);
        audio.fadeMusic();

diff --git a/src/game.cpp b/src/game.cpp
index 5deea33b27500c6ee51aff725078bc56d15e884b..b0fb01e374d656f4cf3b39a955cff94b047c6165 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -870,7 +870,7 @@ int doGame()
                        if (strcmp(map.name, "Space Station"))
                        {
                                graphics.delay(1000);
-                               audio.loadMusic("music/commando.xm");
+                               audio.loadMusic("music/grasslands");
                                audio.playMusic();
                                graphics.fadeToBlack();
                                

diff --git a/src/hub.cpp b/src/hub.cpp
index 3f4ecc91f90f86c866a1b61f002d25b995496d5b..e3a1be35db910fc0a27e9489782a94239c0179c2 100644 (file)
--- a/src/hub.cpp
+++ b/src/hub.cpp
@@ -438,7 +438,7 @@ int doHub()
        audio.free();
 
        graphics.loadBackground("gfx/main/worldMap.jpg");
-       audio.loadMusic("music/forAFriend.mod");
+       audio.loadMusic("music/hub");
        
        // we might want this now, for medals
        audio.loadSound(SND_ITEM, "sound/item.wav");

diff --git a/src/mapEditor.cpp b/src/mapEditor.cpp
index b25fc315ae6d6a71f655038354d15ea75673da76..2f3bc9823c8bc987a7c9c5a3b44e4bede52e50cf 100644 (file)
--- a/src/mapEditor.cpp
+++ b/src/mapEditor.cpp
@@ -320,7 +320,7 @@ void newMap(const char *name)
 
                fprintf(fp, "EMH TILESET gfx/grasslands\n");
                fprintf(fp, "EMH BACKGROUND gfx/grasslands/stone.jpg\n");
-               fprintf(fp, "EMH MUSIC music/viking.mod\n");
+               fprintf(fp, "EMH MUSIC music/tunnel\n");
 
                fprintf(fp, "EMH ALPHATILES 1 2 3 200 201 202 203 204 244 245 246 -1\n");
 

diff --git a/src/title.cpp b/src/title.cpp
index 29dcd86a226f4eb9110cf53d0a5e89abe9e435ed..f219f054e1d09f5d30710f07021939fe52cca102 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -197,7 +197,7 @@ int title()
 
        SDL_SetAlpha(title, SDL_SRCALPHA|SDL_RLEACCEL, 0);
 
-       audio.loadMusic("music/helmet-shake.mod");
+       audio.loadMusic("music/title");
 
        graphics.loadBackground("gfx/main/CircuitBoard.jpg");
        SDL_SetAlpha(graphics.background, SDL_SRCALPHA|SDL_RLEACCEL, 0);
@@ -512,7 +512,7 @@ void doCredits()
        SDL_Surface *device = graphics.quickSprite("credit", graphics.loadImage("gfx/main/creditsDevice.png"));
        float deviceY = y[numberOfCredits - 7] - 50;
 
-       audio.loadMusic("music/autumnsDawning.s3m");
+       audio.loadMusic("music/credits");
        audio.playMusic();
 
        engine.resetTimeDifference();