zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: snd_musicvolume needs to check GSnd for NULL, since somebody might have set an

Browse source 
atexit for it, which gets executed after the sound system shuts down.
- Fixed: FPlayList::Backup() failed to wrap around below entry 0 because Position is
  unsigned now.

SVN r2188 (trunk)
This commit is contained in:
Randy Heit 2010-03-05 03:11:10 +00:00
parent 61865b30be
commit 758327f4b3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/s_playlist.cpp
View file

@ -198,7 +198,7 @@ int FPlayList::Advance ()
int FPlayList::Backup () int FPlayList::Backup ()
{ {
if (--Position < 0) if (Position-- == 0)
{ {
Position = Songs.Size() - 1; Position = Songs.Size() - 1;
} }

3
src/sound/i_music.cpp
View file

@ -112,7 +112,10 @@ CUSTOM_CVAR (Float, snd_musicvolume, 0.5f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
else else
{ {
// Set general music volume. // Set general music volume.
if (GSnd != NULL)
{
GSnd->SetMusicVolume(clamp<float>(self * relative_volume, 0, 1)); GSnd->SetMusicVolume(clamp<float>(self * relative_volume, 0, 1));
}
// For music not implemented through the digital sound system, // For music not implemented through the digital sound system,
// let them know about the change. // let them know about the change.
if (currSong != NULL) if (currSong != NULL)