From 5ad589da061b7d193aaa9a4f7960da9e60aaa7bf Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 4 Jun 2014 01:49:32 +0200
Subject: SCUMM: Fix music looping in AD player.

---
 engines/scumm/players/player_ad.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/players/player_ad.cpp b/engines/scumm/players/player_ad.cpp
index 4f3a17fa66..3b86c565a4 100644
--- a/engines/scumm/players/player_ad.cpp
+++ b/engines/scumm/players/player_ad.cpp
@@ -419,7 +419,7 @@ void Player_AD::startMusic() {
 	_timerLimit = isLoom ? 473 : 256;
 	_musicTicks = _musicData[3] * (isLoom ? 2 : 1);
 	_loopFlag = (_musicData[4] == 0);
-	_musicLoopStart = READ_LE_UINT16(_musicData + 5);
+	_musicLoopStart = _curOffset + READ_LE_UINT16(_musicData + 5);
 }
 
 void Player_AD::stopMusic() {
@@ -476,6 +476,7 @@ void Player_AD::updateMusic() {
 					// In case the track is looping jump to the start.
 					_curOffset = _musicLoopStart;
 					_nextEventTimer = 0;
+					continue;
 				} else {
 					// Otherwise completely stop playback.
 					stopMusic();
-- 
cgit v1.2.3