From c06feb0b9707c108ce0b6cab75f63e89b0dd36b1 Mon Sep 17 00:00:00 2001 From: driAn Date: Mon, 19 May 2008 23:08:49 +0000 Subject: [PATCH] fixed volume fading issue git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2061 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/sound.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/src/sound.cpp b/source/src/sound.cpp index 05c448f7..106703e0 100644 --- a/source/src/sound.cpp +++ b/source/src/sound.cpp @@ -248,7 +248,6 @@ struct oggstream { if(!totalseconds) return; ov_time_seek_page(&oggfile, fmod(offset, totalseconds)); - if(playing()) update(); } }; @@ -654,7 +653,7 @@ void musicsuggest(int id, int millis, bool rndofs) // play bg music if nothing e { gamemusic.fadein(lastmillis, 1000); gamemusic.fadeout(millis ? lastmillis+millis : 0, 1000); - if(rndofs) gamemusic.seek(millis ? (double)rnd(millis/2) : (double)lastmillis); + if(rndofs) gamemusic.seek(millis ? (double)rnd(millis)/2.0f : (double)lastmillis); if(!gamemusic.playback(rndofs)) conoutf("could not play music: %s", name); } else conoutf("could not open music: %s", name);