mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-22 12:31:32 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
473597dd02
3 changed files with 3 additions and 3 deletions
|
@ -164,7 +164,7 @@ void I_SetMusicVolume(UINT8 volume)
|
||||||
(void)volume;
|
(void)volume;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_SetSongTrack(int track)
|
boolean I_SetSongTrack(INT32 track)
|
||||||
{
|
{
|
||||||
(void)track;
|
(void)track;
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -1441,7 +1441,7 @@ void I_SetMusicVolume(UINT8 volume)
|
||||||
Mix_VolumeMusic(get_real_volume(music_volume));
|
Mix_VolumeMusic(get_real_volume(music_volume));
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_SetSongTrack(int track)
|
boolean I_SetSongTrack(INT32 track)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_GME
|
#ifdef HAVE_GME
|
||||||
// If the specified track is within the number of tracks playing, then change it
|
// If the specified track is within the number of tracks playing, then change it
|
||||||
|
|
|
@ -1471,7 +1471,7 @@ void I_SetMusicVolume(UINT8 volume)
|
||||||
(void)volume;
|
(void)volume;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_SetSongTrack(int track)
|
boolean I_SetSongTrack(INT32 track)
|
||||||
{
|
{
|
||||||
(void)track;
|
(void)track;
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue