From 7a80c4cdb39f003fb893361dde25d40ecd08101a Mon Sep 17 00:00:00 2001
From: Jussi Pitkanen
Date: Sun, 12 Jun 2011 17:30:03 +0300
Subject: AGI: Fix row duration in V1 SOUND resource player

---
 engines/agi/sound_pcjr.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'engines/agi/sound_pcjr.cpp')

diff --git a/engines/agi/sound_pcjr.cpp b/engines/agi/sound_pcjr.cpp
index 2ca71557ba..14525dc845 100644
--- a/engines/agi/sound_pcjr.cpp
+++ b/engines/agi/sound_pcjr.cpp
@@ -297,7 +297,6 @@ int SoundGenPCJr::getNextNote_v2(int ch) {
 }
 
 int SoundGenPCJr::getNextNote_v1(int ch) {
-	static int channels = 4;
 	static int duration = 0;
 
 	byte *data = _v1data;
@@ -310,19 +309,12 @@ int SoundGenPCJr::getNextNote_v1(int ch) {
 		return -1;
 	}
 	
-	// Get previously fetched data if possible
-	if (channels > 0) {
-		channels--;
-		return 0;
-	}
-	channels = 4;
-
-	// In the V1 player the default duration for a row is 2 ticks
+	// In the V1 player the default duration for a row is 3 ticks
 	if (duration > 0) {
 		duration--;
 		return 0;
 	}
-	duration = 2 * CHAN_MAX;
+	duration = 3 * CHAN_MAX;
 
 	// Otherwise fetch a row of data for all channels
 	while (*data) {
-- 
cgit v1.2.3