From: Guus Sliepen <guus@sliepen.eu.org>
Date: Sat, 3 Jul 2010 13:15:19 +0000 (+0200)
Subject: Replace music filenames with generic filenames.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f3991f4cf43341ffe1ecfc7131c7cbcc08977156;p=quix0rs-blobwars.git

Replace music filenames with generic filenames.
---

diff --git a/data/arcticWastes b/data/arcticWastes
index ccb29b0..58987d2 100644
--- 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 4f496e6..0a3405f 100644
--- 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 eedee8e..9cfc3ae 100644
--- 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 53de102..b9790c4 100644
--- 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 940a7a6..59ec9bf 100644
--- 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 25f2e6d..d536408 100644
--- 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 46b37c2..3c87e9d 100644
--- 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 5e2fa74..b4e4bb0 100644
--- 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 f61ae5e..43b738c 100644
--- 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 5e7935d..12ea8ec 100644
--- 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 c4a1972..e4bb444 100644
--- 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 68cfdae..de7f538 100644
--- 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 17cc075..4fe043a 100644
--- 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 1be1eca..8ba6921 100644
--- 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 d933c9f..f84b1db 100644
--- 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 f97b715..95b0b48 100644
--- 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 4a2bfd7..921bf8b 100644
--- 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 bb21cfc..ed1d6b4 100644
--- 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 81cb213..4cd6a85 100644
--- 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 4355f6f..8d14722 100644
--- 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 5671905..79276aa 100644
--- 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 bb6f314..d714709 100644
--- 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 9fa4cd8..13a152c 100644
--- 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 3f8fe37..8d92c39 100644
--- 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 5b1d312..ec6b3a0 100644
--- 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 c985f5e..bac32ef 100644
--- 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 3542842..8657767 100644
--- 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 5deea33..b0fb01e 100644
--- 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 3f4ecc9..e3a1be3 100644
--- 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 b25fc31..2f3bc98 100644
--- 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 29dcd86..f219f05 100644
--- 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();