Ticket #8235: loom-sound-new.diff

scumm/player_v2.cpp

@@ -526 +526 @@
                 } else { // opcode < 0xf8
                         for (;;) {
                                 int16 note, octave;
-                                dest_channel = &channels[opcode >> 5];
-                                channel->d.time_left = channel->d.tempo * note_lengths[opcode & 0x1f];
+                                int is_last_note;
+                                dest_channel = &channels[(opcode >> 5) & 3];
+
+                                if (!(opcode & 0x80)) {
+
+                                        int tempo = channel->d.tempo;
+                                        if (!tempo)
+                                                tempo = 1;
+                                        channel->d.time_left = tempo * note_lengths[opcode & 0x1f];
+
+                                        note = *script_ptr++;
+                                        is_last_note = note & 0x80;
+                                        note &= 0x7f;
+                                        if (note == 0x7f) 
+                                                goto end;
+                                } else {
+
+                                        channel->d.time_left = ((opcode & 7) << 8) | *script_ptr++;
+
+                                        if ((opcode & 0x10))
+                                                goto end;
+
+                                        is_last_note = 0;
+                                        note = (*script_ptr++) & 0x7f;
+                                }
+
+
                                 debug(9, "channels[%d]: @%04x note: %3d+%d len: %2d hull: %d mod: %d/%d/%d %s\n", 
-                                      opcode>>5, script_ptr ? script_ptr - current_data : 0,
-                                      *script_ptr & 0x7f, (signed short) dest_channel->d.transpose, opcode & 0x1f,
+                                      dest_channel - channel, script_ptr ? script_ptr - current_data - 2 : 0,
+                                      note, (signed short) dest_channel->d.transpose, channel->d.time_left,
                                       dest_channel->d.hull_curve, dest_channel->d.freqmod_table,
                                       dest_channel->d.freqmod_incr,dest_channel->d.freqmod_multiplier,
-                                      *script_ptr & 0x80 ? "last":"");
-                                opcode = *script_ptr++;
-                                note = opcode & 0x7f;
-                                if (note != 0x7f) {
-                                        uint16 myfreq;
-                                        dest_channel->d.time_left = channel->d.time_left;
-                                        dest_channel->d.note_length = 
+                                      is_last_note ? "last":"");
+
+
+                                uint16 myfreq;
+                                dest_channel->d.time_left = channel->d.time_left;
+                                dest_channel->d.note_length = 
                                         channel->d.time_left - dest_channel->d.inter_note_pause;
-                                        note += dest_channel->d.transpose;
-                                        while (note < 0)
-                                                note += 12;
-                                        octave = note / 12;
-                                        note = note % 12;
-                                        dest_channel->d.hull_offset = 0;
-                                        dest_channel->d.hull_counter = 1;
-                                        if (pcjr && dest_channel == &channels[3]) {
-                                                dest_channel->d.hull_curve = 180 + note * 12;
-                                                myfreq = 384 - 64 * octave;
-                                        } else {
-                                                myfreq = freqs_table[note] >> octave;
-                                        }
-                                        dest_channel->d.freq = dest_channel->d.base_freq = myfreq;
+                                note += dest_channel->d.transpose;
+                                while (note < 0)
+                                        note += 12;
+                                octave = note / 12;
+                                note = note % 12;
+                                dest_channel->d.hull_offset = 0;
+                                dest_channel->d.hull_counter = 1;
+                                if (pcjr && dest_channel == &channels[3]) {
+                                        dest_channel->d.hull_curve = 180 + note * 12;
+                                        myfreq = 384 - 64 * octave;
+                                } else {
+                                        myfreq = freqs_table[note] >> octave;
                                 }
-                                if ((opcode & 0x80) != 0)
+                                dest_channel->d.freq = dest_channel->d.base_freq = myfreq;
+                                if (is_last_note)
                                         goto end;
                                 opcode = *script_ptr++;
                         }

scumm/scummvm.cpp

@@ -611 +611 @@
                 _imuseDigital = new IMuseDigital(this);
                 _imuse = NULL;
                 _playerV2 = NULL;
-        } else if (_features & GF_OLD_BUNDLE && !(_features & GF_AFTER_V3)) {
+        } else if (_features & GF_OLD_BUNDLE) {
                 _playerV2 = NULL;
                 if (!(_features & GF_AMIGA))
                         _playerV2 = new Player_V2();