diff options
| author | Simon Howard | 2005-09-05 22:50:56 +0000 |
|---|---|---|
| committer | Simon Howard | 2005-09-05 22:50:56 +0000 |
| commit | b09ff6f00346a6aacf09930888523ab8a68115e2 (patch) | |
| tree | bb0b6c0ebbf23e18e3f6f3c71c97312a63df1a0c /src/s_sound.c | |
| parent | b932593c9e68337bfcbd43f8b69f5a4cc8d04ff8 (diff) | |
| download | chocolate-doom-b09ff6f00346a6aacf09930888523ab8a68115e2.tar.gz chocolate-doom-b09ff6f00346a6aacf09930888523ab8a68115e2.tar.bz2 chocolate-doom-b09ff6f00346a6aacf09930888523ab8a68115e2.zip | |
Add mmus2mid code from prboom. Use 'void *' for music handles. Pass
length of data when registering music.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 75
Diffstat (limited to 'src/s_sound.c')
| -rw-r--r-- | src/s_sound.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/s_sound.c b/src/s_sound.c index 90b8ac06..8c4b571a 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: s_sound.c 73 2005-09-05 20:32:18Z fraggle $ +// $Id: s_sound.c 75 2005-09-05 22:50:56Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,10 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.6 2005/09/05 22:50:56 fraggle +// Add mmus2mid code from prboom. Use 'void *' for music handles. Pass +// length of data when registering music. +// // Revision 1.5 2005/09/05 20:32:18 fraggle // Use the system-nonspecific sound code to assign the channel number used // by SDL. Remove handle tagging stuff. @@ -46,7 +50,7 @@ static const char -rcsid[] = "$Id: s_sound.c 73 2005-09-05 20:32:18Z fraggle $"; +rcsid[] = "$Id: s_sound.c 75 2005-09-05 22:50:56Z fraggle $"; @@ -685,7 +689,7 @@ S_ChangeMusic // load & register it music->data = (void *) W_CacheLumpNum(music->lumpnum, PU_MUSIC); - music->handle = I_RegisterSong(music->data); + music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum)); // play it I_PlaySong(music->handle, looping); |