1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

New Feature: mp3 audio format is now supported in addition to .wav and .ogg

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-19 21:42:07 +00:00
parent c96bed1110
commit 69aeea0679
4 changed files with 144 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Music Control.cpp
+24 -40
View File
@@ -151,57 +151,41 @@ BOOLEAN MusicPlay(UINT32 uiNum)
if ( NewSound == FALSE && MusicMode == MUSIC_OLD_TYPE )
{
#endif
sprintf( zFileName, "%s.ogg", szMusicList[uiNum] );
sprintf( zFileName, "%s.mp3", szMusicList[uiNum] );
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s.wav", szMusicList[uiNum] );
{
sprintf( zFileName, "%s.ogg", szMusicList[uiNum] );
if ( !FileExists( zFileName ) )
{
sprintf( zFileName, "%s.wav", szMusicList[uiNum] );
}
}
#ifdef NEWMUSIC
}
else if ( NewSound == TRUE )
{
//sprintf( zFileName, szMusicList[15] );
if ( MusicMode == MUSIC_TACTICAL_NOTHING )
CHAR8 modstr[32] = "";
switch ( MusicMode )
{
sprintf( zFileName, "%s\\NOTHING_%d.ogg", szMusicList[15], uiNum);
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\NOTHING_%d.wav", szMusicList[15], uiNum );
case MUSIC_TACTICAL_NOTHING: sprintf( modstr, "NOTHING_" ); break;
case MUSIC_TACTICAL_ENEMYPRESENT: sprintf( modstr, "TENSOR_" ); break;
case MUSIC_TACTICAL_BATTLE: sprintf( modstr, "BATTLE_" ); break;
case MUSIC_TACTICAL_VICTORY: sprintf( modstr, "TRIUMPH_" ); break;
case MUSIC_TACTICAL_BATTLE_MUSIC: sprintf( modstr, "CREATURE_BATTLE_" ); break;
case MUSIC_TACTICAL_CREEPY_MUSIC: sprintf( modstr, "CREEPY_" ); break;
default: break;
}
else if ( MusicMode == MUSIC_TACTICAL_ENEMYPRESENT )
{
sprintf( zFileName, "%s\\TENSOR_%d.ogg", szMusicList[15], uiNum);
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\TENSOR_%d.wav", szMusicList[15], uiNum );
}
else if ( MusicMode == MUSIC_TACTICAL_BATTLE )
{
sprintf( zFileName, "%s\\BATTLE_%d.ogg", szMusicList[15], uiNum);
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\BATTLE_%d.wav", szMusicList[15], uiNum );
}
else if ( MusicMode == MUSIC_TACTICAL_VICTORY )
{
sprintf( zFileName, "%s\\TRIUMPH_%d.ogg", szMusicList[15], uiNum);
sprintf( zFileName, "%s\\%s%d.ogg", szMusicList[15], modstr, uiNum );
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\TRIUMPH_%d.wav", szMusicList[15], uiNum );
}
else if ( MusicMode == MUSIC_TACTICAL_BATTLE_MUSIC )
{
sprintf( zFileName, "%s\\CREATURE_BATTLE_%d.ogg", szMusicList[15], uiNum);
sprintf( zFileName, "%s\\%s%d.wav", szMusicList[15], modstr, uiNum );
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\CREATURE_BATTLE_%d.wav", szMusicList[15], uiNum );
{
sprintf( zFileName, "%s\\%s%d.mp3", szMusicList[15], modstr, uiNum );
}
}
else if ( MusicMode == MUSIC_TACTICAL_CREEPY_MUSIC )
{
sprintf( zFileName, "%s\\CREEPY_%d.ogg", szMusicList[15], uiNum);
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\CREEPY_%d.wav", szMusicList[15], uiNum );
}
else if ( MusicMode == OTHER_MUSIC_TACTICAL )
{
sprintf( zFileName, "%s\\%d.ogg", szMusicList[15], uiNum);
if ( !FileExists( zFileName ) )
sprintf( zFileName, "%s\\%d.wav", szMusicList[15], uiNum );
}
}
#endif
uiMusicHandle = SoundPlayStreamedFile(zFileName, &spParms);