shithub: choc

Download patch

ref: 6ad993a2eb5e54bac367b7c70bdfb4402f406a3d
parent: f4303dd6686f249e67002bfb561a3145b827e39c
author: Simon Howard <fraggle@soulsphere.org>
date: Thu May 28 05:12:37 EDT 2015

Rollback of 4f8f8a43e174f1e82dc0160c0ea96070e1cf6ef9.

I previously tweaked the voice replacement algorithm, but after
listening to the MAP01 music in DOSbox, this does indeed seem to be
how the music sounds in Vanilla Doom.

--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -732,9 +732,8 @@
 
     for (rover = voice_alloced_list; rover != NULL; rover = rover->next)
     {
-        if (rover->current_instr_voice > result->current_instr_voice
-         || (rover->current_instr_voice == result->current_instr_voice
-          && rover->channel >= result->channel))
+        if (rover->current_instr_voice != 0
+         || rover->channel >= result->channel)
         {
             result = rover;
         }