if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/%s.ogg", trackname); // added by motorsep
if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/%s.ogg", trackname); // added by motorsep
}
- if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, true)))
+ if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, false)))
{
- faketrack = S_StartSound_StartPosition (-1, 0, sfx, vec3_origin, cdvolume, 0, startposition);
+ faketrack = S_StartSound_StartPosition_Flags (-1, 0, sfx, vec3_origin, cdvolume, 0, startposition, (looping ? CHANNELFLAG_FORCELOOP : 0) | CHANNELFLAG_FULLVOLUME | CHANNELFLAG_LOCALSOUND);
if (faketrack != -1)
{
- if (looping)
- S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
- S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
- S_SetChannelFlag (faketrack, CHANNELFLAG_LOCALSOUND, true); // not pausable
if(track >= 1)
{
if(cdaudio.integer != 0) // we don't need these messages if only fake tracks can be played anyway
if (faketrack != -1)
{
- S_StopChannel (faketrack, true);
+ S_StopChannel (faketrack, true, true);
faketrack = -1;
}
else if (cdPlaying && (CDAudio_SysStop() == -1))
if (faketrack != -1)
S_SetChannelVolume (faketrack, newvol);
else
- CDAudio_SysSetVolume (newvol);
+ CDAudio_SysSetVolume (newvol * mastervolume.value);
}
cdvolume = newvol;