aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJussi Pitkanen2011-06-12 17:30:03 +0300
committerEugene Sandulenko2011-08-13 23:26:44 +0100
commit7a80c4cdb39f003fb893361dde25d40ecd08101a (patch)
tree0967e3b2f113192e41f5e55726567e9dcfa4ba66 /engines
parent1507fe4e792528244fe3c8d1a9ae45ac40936efe (diff)
downloadscummvm-rg350-7a80c4cdb39f003fb893361dde25d40ecd08101a.tar.gz
scummvm-rg350-7a80c4cdb39f003fb893361dde25d40ecd08101a.tar.bz2
scummvm-rg350-7a80c4cdb39f003fb893361dde25d40ecd08101a.zip
AGI: Fix row duration in V1 SOUND resource player
Diffstat (limited to 'engines')
-rw-r--r--engines/agi/sound_pcjr.cpp12
1 files changed, 2 insertions, 10 deletions
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) {