X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=aa33079dd2ea55710e50481907f3a85cb5918734;hb=4eb6393c19467e2a1e45913397aaf11380d1cd83;hp=afca524a18a4f73c8d435ba74449cc61fb12bbd4;hpb=bf01d51f8f77e37c098899e10abc4f51dff59baa;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index afca524a..aa33079d 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -48,7 +48,8 @@ static qboolean wasPlaying = false;
 static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
-static unsigned char remap[MAXTRACKS];
+typedef char filename_t[MAX_QPATH];
+static filename_t remap[MAXTRACKS];
 static unsigned char maxTrack;
 static int faketrack = -1;
 
@@ -98,7 +99,7 @@ static int CDAudio_GetAudioDiskInfo (void)
 
 void CDAudio_Play_byName (const char *trackname, qboolean looping)
 {
-	unsigned char track;
+	unsigned int track;
 	sfx_t* sfx;
 
 	Host_StartVideo();
@@ -109,7 +110,14 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 	if(strspn(trackname, "0123456789") == strlen(trackname))
 	{
 		track = (unsigned char) atoi(trackname);
-		track = remap[track];
+		if(track > 0 && track < MAXTRACKS)
+				if(*remap[track])
+					trackname = remap[track];
+	}
+
+	if(strspn(trackname, "0123456789") == strlen(trackname))
+	{
+		track = (unsigned char) atoi(trackname);
 		if (track < 1)
 		{
 			Con_Printf("CDAudio: Bad track number %u.\n", track);
@@ -129,10 +137,16 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 		sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
 		if (sfx == NULL || !S_IsSoundPrecached (sfx))
 			sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
+		if (sfx == NULL || !S_IsSoundPrecached (sfx))
+			sfx = S_PrecacheSound (va ("cdtracks/track%02u", track), false, false);
+		if (sfx == NULL || !S_IsSoundPrecached (sfx))
+			sfx = S_PrecacheSound (va ("cdtracks/track%03u", track), false, false);
 	}
 	else
 	{
 		sfx = S_PrecacheSound (va("cdtracks/%s.wav", trackname), false, false);
+		if (sfx == NULL || !S_IsSoundPrecached (sfx))
+			sfx = S_PrecacheSound (va("cdtracks/%s", trackname), false, false);
 	}
 	if (sfx != NULL)
 	{
@@ -157,7 +171,7 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping)
 			Con_Print("Could not load BGM track.\n");
 			return;
 		}
-	
+
 		if (!cdValid)
 		{
 			CDAudio_GetAudioDiskInfo();
@@ -195,15 +209,15 @@ void CDAudio_Play (unsigned char track, qboolean looping)
 
 void CDAudio_Stop (void)
 {
-	if (!enabled || !cdPlaying)
+	if (!enabled)
 		return;
 
 	if (faketrack != -1)
 	{
-		S_StopChannel (faketrack);
+		S_StopChannel (faketrack, true);
 		faketrack = -1;
 	}
-	else if (CDAudio_SysStop() == -1)
+	else if (cdPlaying && (CDAudio_SysStop() == -1))
 		return;
 
 	wasPlaying = false;
@@ -243,13 +257,14 @@ static void CD_f (void)
 	int ret;
 	int n;
 
-	Host_StartVideo();
-
 	if (Cmd_Argc() < 2)
 		return;
 
 	command = Cmd_Argv (1);
 
+	if (strcasecmp(command, "remap") != 0)
+		Host_StartVideo();
+
 	if (strcasecmp(command, "on") == 0)
 	{
 		enabled = true;
@@ -270,7 +285,7 @@ static void CD_f (void)
 		if (cdPlaying)
 			CDAudio_Stop();
 		for (n = 0; n < MAXTRACKS; n++)
-			remap[n] = n;
+			*remap[n] = 0; // empty string, that is, unremapped
 		CDAudio_GetAudioDiskInfo();
 		return;
 	}
@@ -281,12 +296,12 @@ static void CD_f (void)
 		if (ret <= 0)
 		{
 			for (n = 1; n < MAXTRACKS; n++)
-				if (remap[n] != n)
-					Con_Printf("  %u -> %u\n", n, remap[n]);
+				if (*remap[n])
+					Con_Printf("  %u -> %s\n", n, remap[n]);
 			return;
 		}
 		for (n = 1; n <= ret; n++)
-			remap[n] = atoi(Cmd_Argv (n+1));
+			strlcpy(remap[n], Cmd_Argv (n+1), sizeof(*remap));
 		return;
 	}
 
@@ -413,7 +428,7 @@ int CDAudio_Init (void)
 	CDAudio_SysInit();
 
 	for (i = 0; i < MAXTRACKS; i++)
-		remap[i] = i;
+		*remap[i] = 0;
 
 	Cvar_RegisterVariable(&cdaudioinitialized);
 	Cvar_SetValueQuick(&cdaudioinitialized, true);
@@ -426,6 +441,9 @@ int CDAudio_Init (void)
 
 int CDAudio_Startup (void)
 {
+	if (COM_CheckParm("-nocdaudio"))
+		return -1;
+
 	CDAudio_SysStartup ();
 
 	if (CDAudio_GetAudioDiskInfo())