summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2015-05-28 09:12:37 -0400
committerSimon Howard2015-05-28 09:12:37 -0400
commit6ad993a2eb5e54bac367b7c70bdfb4402f406a3d (patch)
treefb28b51bff36807c470aea41f2e59b673832cd87 /src
parentf4303dd6686f249e67002bfb561a3145b827e39c (diff)
downloadchocolate-doom-6ad993a2eb5e54bac367b7c70bdfb4402f406a3d.tar.gz
chocolate-doom-6ad993a2eb5e54bac367b7c70bdfb4402f406a3d.tar.bz2
chocolate-doom-6ad993a2eb5e54bac367b7c70bdfb4402f406a3d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/i_oplmusic.c5
1 files changed, 2 insertions, 3 deletions
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;
}