1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- allow playback of .ogg files in Music folder (by Lesh)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-04-26 21:11:36 +00:00
parent 40979fce1c
commit b503a6e95b
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Music Control.cpp
+22 -16
View File
@@ -47,21 +47,21 @@ static BOOLEAN gfDontRestartSong = FALSE;
CHAR8 *szMusicList[NUM_MUSIC]= CHAR8 *szMusicList[NUM_MUSIC]=
{ {
"MUSIC\\marimbad 2.wav", "MUSIC\\marimbad 2",
"MUSIC\\menumix1.wav", "MUSIC\\menumix1",
"MUSIC\\nothing A.wav", "MUSIC\\nothing A",
"MUSIC\\nothing B.wav", "MUSIC\\nothing B",
"MUSIC\\nothing C.wav", "MUSIC\\nothing C",
"MUSIC\\nothing D.wav", "MUSIC\\nothing D",
"MUSIC\\tensor A.wav", "MUSIC\\tensor A",
"MUSIC\\tensor B.wav", "MUSIC\\tensor B",
"MUSIC\\tensor C.wav", "MUSIC\\tensor C",
"MUSIC\\triumph.wav", "MUSIC\\triumph",
"MUSIC\\death.wav", "MUSIC\\death",
"MUSIC\\battle A.wav", "MUSIC\\battle A",
"MUSIC\\tensor B.wav", "MUSIC\\tensor B",
"MUSIC\\creepy.wav", "MUSIC\\creepy",
"MUSIC\\creature battle.wav", "MUSIC\\creature battle",
}; };
BOOLEAN StartMusicBasedOnMode(void); BOOLEAN StartMusicBasedOnMode(void);
@@ -113,6 +113,7 @@ BOOLEAN MusicPlay(UINT32 uiNum)
//if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/ //if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
//return FALSE; //return FALSE;
static CHAR8 zFileName[164];
SOUNDPARMS spParms; SOUNDPARMS spParms;
if(fMusicPlaying) if(fMusicPlaying)
@@ -127,7 +128,12 @@ BOOLEAN MusicPlay(UINT32 uiNum)
//DebugMsg( TOPIC_JA2, DBG_LEVEL_3, "About to call SoundPlayStreamedFile" ); //DebugMsg( TOPIC_JA2, DBG_LEVEL_3, "About to call SoundPlayStreamedFile" );
uiMusicHandle = SoundPlayStreamedFile(szMusicList[uiNum], &spParms); // Lesh: patch to allow playback ogg files
sprintf( zFileName, "%s.ogg", szMusicList[uiNum] );
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s.wav", szMusicList[uiNum] );
uiMusicHandle = SoundPlayStreamedFile(zFileName, &spParms);
if(uiMusicHandle != SOUND_ERROR) if(uiMusicHandle != SOUND_ERROR)
{ {