zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Calling S_ChangeMusic() with the same song but a different looping

Browse source 
flag now restarts the song so that the new looping setting can be applied.
  (This was easier than modifying every music handler to support modifying
  loop changes on the fly, which seems like overkill.)


SVN r2041 (trunk)
This commit is contained in:
Randy Heit 2009-12-25 00:41:15 +00:00
parent 735294884e
commit 6beaf818e3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,4 +1,8 @@
December 24, 2009 December 24, 2009
- Fixed: Calling S_ChangeMusic() with the same song but a different looping
flag now restarts the song so that the new looping setting can be applied.
(This was easier than modifying every music handler to support modifying
loop changes on the fly, which seems like overkill.)
- Fixed: savepatchsize was declared incorrectly in d_dehacked.cpp:DoInclude(). - Fixed: savepatchsize was declared incorrectly in d_dehacked.cpp:DoInclude().
- Changed AFastProjectile::Effect() so that it sets the spawned trail to face - Changed AFastProjectile::Effect() so that it sets the spawned trail to face
same direction as the projectile. same direction as the projectile.

4
src/s_sound.cpp
View file

@ -2306,7 +2306,9 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
} }
} }
if (!mus_playing.name.IsEmpty() && stricmp (mus_playing.name, musicname) == 0) if (!mus_playing.name.IsEmpty() &&
stricmp (mus_playing.name, musicname) == 0 &&
mus_playing.handle->m_Looping == looping)
{ {
if (order != mus_playing.baseorder) if (order != mus_playing.baseorder)
{ {