kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed broken music looping

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2067 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-20 18:00:59 +00:00
parent 7293c4a0f8
commit 94e2b820fe
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/sound.cpp
+20 -17
View File
@@ -162,7 +162,7 @@ struct oggstream
bool update()
{
if(!sourceid) return false;
if(!sourceid || !playing()) return false;
// update buffer queue
ALint processed;
bool active = true;
@@ -174,28 +174,31 @@ struct oggstream
alSourceQueueBuffers(sourceid, 1, &bufferids[i]);
}
// fade in
if(startmillis > 0)
if(active)
{
const float start = (lastmillis-startmillis)/(float)startfademillis;
if(start>=0.00f && start<=1.00001f) setgain(start);
}
// fade out
if(endmillis > 0)
{
if(lastmillis>endmillis) // stop
// fade in
if(startmillis > 0)
{
active = false;
const float start = (lastmillis-startmillis)/(float)startfademillis;
if(start>=0.00f && start<=1.00001f) setgain(start);
}
else
// fade out
if(endmillis > 0)
{
const float end = (endmillis-lastmillis)/(float)endfademillis;
if(end>=-0.00001f && end<=1.00f) setgain(end);
if(lastmillis>endmillis) // stop
{
reset();
return false;
}
else // set gain
{
const float end = (endmillis-lastmillis)/(float)endfademillis;
if(end>=-0.00001f && end<=1.00f) setgain(end);
}
}
}
if(!active)
else
{
if(looping) replay();
else reset();