*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@549 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-09 20:21:39 +00:00
parent c7469a7873
commit 1964daf0b3
10 changed files with 25 additions and 13 deletions
+3 -3
View File
@@ -98,18 +98,18 @@ void music(char *name)
s_strcpy(sn, "packages/audio/songs/");
s_strcat(sn, name);
#ifdef USE_MIXER
if(mod = Mix_LoadMUS(path(sn)))
if((mod = Mix_LoadMUS(path(sn))))
{
Mix_PlayMusic(mod, -1);
Mix_VolumeMusic((musicvol*MAXVOL)/255);
}
#else
if(mod = FMUSIC_LoadSong(path(sn)))
if((mod = FMUSIC_LoadSong(path(sn))))
{
FMUSIC_PlaySong(mod);
FMUSIC_SetMasterVolume(mod, musicvol);
}
else if(stream = FSOUND_Stream_Open(path(sn), FSOUND_LOOP_NORMAL, 0, 0))
else if((stream = FSOUND_Stream_Open(path(sn), FSOUND_LOOP_NORMAL, 0, 0)))
{
int chan = FSOUND_Stream_Play(FSOUND_FREE, stream);
if(chan>=0) { FSOUND_SetVolume(chan, (musicvol*MAXVOL)/255); FSOUND_SetPaused(chan, false); };