From 6ad993a2eb5e54bac367b7c70bdfb4402f406a3d Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 28 May 2015 09:12:37 -0400
Subject: 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.
---
 src/i_oplmusic.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/i_oplmusic.c')

diff --git a/src/i_oplmusic.c b/src/i_oplmusic.c
index 54f92465..7715465e 100644
--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -732,9 +732,8 @@ static void ReplaceExistingVoice(void)
 
     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;
         }
-- 
cgit v1.2.3