DP-esque music name conventions
This commit is contained in:
parent
cad3bec766
commit
8db03fa788
1 changed files with 17 additions and 4 deletions
|
@ -2,6 +2,7 @@
|
||||||
* FMOD PLAYBACK, LINKED DYNAMICALLY
|
* FMOD PLAYBACK, LINKED DYNAMICALLY
|
||||||
* THIS TOTALLY WON'T BUILD ON ITS OWN, I SWEAR.
|
* THIS TOTALLY WON'T BUILD ON ITS OWN, I SWEAR.
|
||||||
* YOU'D HAVE TO KNOW HOW TO LINK IT AND STUFF BY YOURSELF.
|
* YOU'D HAVE TO KNOW HOW TO LINK IT AND STUFF BY YOURSELF.
|
||||||
|
* LGPL
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "globaldef.h"
|
#include "globaldef.h"
|
||||||
|
@ -33,7 +34,7 @@ void FmodEx_Play(byte track, qboolean looping)
|
||||||
|
|
||||||
FMOD_Sound_Release (fmod_sound);
|
FMOD_Sound_Release (fmod_sound);
|
||||||
|
|
||||||
sprintf(fmod_file, "%s/music/track%d.flac", com_gamedir, fmod_track);
|
sprintf(fmod_file, "%s/music/track%02d.flac", com_gamedir, fmod_track);
|
||||||
if(fmod_loop == true)
|
if(fmod_loop == true)
|
||||||
fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file,
|
fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file,
|
||||||
FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL | FMOD_CREATESTREAM, 0, &fmod_sound);
|
FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL | FMOD_CREATESTREAM, 0, &fmod_sound);
|
||||||
|
@ -43,7 +44,18 @@ void FmodEx_Play(byte track, qboolean looping)
|
||||||
|
|
||||||
if (fmod_result != FMOD_OK)
|
if (fmod_result != FMOD_OK)
|
||||||
{
|
{
|
||||||
sprintf(fmod_file, "%s/music/track%d.ogg", com_gamedir, fmod_track);
|
sprintf(fmod_file, "%s/music/track%02d.wav", com_gamedir, fmod_track);
|
||||||
|
|
||||||
|
if(fmod_loop == true)
|
||||||
|
fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file,
|
||||||
|
FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL | FMOD_CREATESTREAM, 0, &fmod_sound);
|
||||||
|
else
|
||||||
|
fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file,
|
||||||
|
FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_OFF | FMOD_CREATESTREAM, 0, &fmod_sound);
|
||||||
|
|
||||||
|
if (fmod_result != FMOD_OK)
|
||||||
|
{
|
||||||
|
sprintf(fmod_file, "%s/music/track%02d.ogg", com_gamedir, fmod_track);
|
||||||
|
|
||||||
if(fmod_loop == true)
|
if(fmod_loop == true)
|
||||||
fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file,
|
fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file,
|
||||||
|
@ -58,6 +70,7 @@ void FmodEx_Play(byte track, qboolean looping)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FMOD_System_PlaySound (fmod_system, FMOD_CHANNEL_FREE, fmod_sound, 0, &fmod_channel);
|
FMOD_System_PlaySound (fmod_system, FMOD_CHANNEL_FREE, fmod_sound, 0, &fmod_channel);
|
||||||
FMOD_Channel_SetVolume(fmod_channel, fmod_volume);
|
FMOD_Channel_SetVolume(fmod_channel, fmod_volume);
|
||||||
|
|
Loading…
Reference in a new issue