fixed 3 digit cdtracks loading (it was improperly checking the returned sfx, which...

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 998f76f4667de97fc4abfd954693c63a3a80450e..575540268228bcce31bf67b0c6db61809c2e01b9 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include "quakedef.h"
+#include "snd_main.h"
+
+#define MAXTRACKS      256
 
 // Prototypes of the system dependent functions
 extern void CDAudio_SysEject (void);
@@ -44,7 +47,7 @@ static qboolean wasPlaying = false;
 static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
-static qbyte remap[100];
+static qbyte remap[MAXTRACKS];
 static qbyte maxTrack;
 static int faketrack = -1;
 
@@ -105,19 +108,23 @@ void CDAudio_Play (qbyte track, qboolean looping)
                return;
        }
 
-       if (cdPlaying && cdPlayTrack == track)
+       if (cdPlaying && cdPlayTrack == track && faketrack == -1)
                return;
        CDAudio_Stop ();
 
        // Try playing a fake track (sound file) first
-       sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, true);
+       sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
+       // FIXME: perhaps force it to be always %03u (but for compatibility?):
+       if (sfx == NULL || sfx->fetcher == NULL)
+               sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
        if (sfx != NULL)
        {
                faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
                if (faketrack != -1)
                {
                        if (looping)
-                               S_LoopChannel (faketrack, true);
+                               S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
+                       S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
                        Con_DPrintf ("Fake CD track %u playing...\n", track);
                }
        }
@@ -177,7 +184,7 @@ void CDAudio_Pause (void)
                return;
 
        if (faketrack != -1)
-               S_PauseChannel (faketrack, true);
+               S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, true);
        else if (CDAudio_SysPause() == -1)
                return;
 
@@ -192,7 +199,7 @@ void CDAudio_Resume (void)
                return;
 
        if (faketrack != -1)
-               S_PauseChannel (faketrack, false);
+               S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false);
        else if (CDAudio_SysResume() == -1)
                return;
        cdPlaying = true;
@@ -228,7 +235,7 @@ static void CD_f (void)
                enabled = true;
                if (cdPlaying)
                        CDAudio_Stop();
-               for (n = 0; n < 100; n++)
+               for (n = 0; n < MAXTRACKS; n++)
                        remap[n] = n;
                CDAudio_GetAudioDiskInfo();
                return;
@@ -239,7 +246,7 @@ static void CD_f (void)
                ret = Cmd_Argc() - 2;
                if (ret <= 0)
                {
-                       for (n = 1; n < 100; n++)
+                       for (n = 1; n < MAXTRACKS; n++)
                                if (remap[n] != n)
                                        Con_Printf("  %u -> %u\n", n, remap[n]);
                        return;
@@ -357,7 +364,7 @@ int CDAudio_Init (void)
 
        CDAudio_SysInit();
 
-       for (i = 0; i < 100; i++)
+       for (i = 0; i < MAXTRACKS; i++)
                remap[i] = i;
 
        Cvar_RegisterVariable(&cdaudioinitialized);