Merge branch 'master' into next

This commit is contained in:
Monster Iestyn 2023-11-29 16:49:18 +00:00
commit 473597dd02
3 changed files with 3 additions and 3 deletions

View file

@ -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;

View file

@ -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

View file

@ -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;