From 8820b6166ecc5f2c76e926aefdbf4d3ad6f2f062 Mon Sep 17 00:00:00 2001
From: Scott Thomas
Date: Wed, 5 Aug 2009 13:57:40 +0000
Subject: T7G: Fix bug #2831041 by implementing opcode responsible for starting
 music partway through a video

svn-id: r43068
---
 engines/groovie/script.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'engines/groovie/script.cpp')

diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 10a63fc5d1..7fdfa6c780 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -564,6 +564,7 @@ bool Script::playvideofromref(uint32 fileref) {
 	// Video available, play one frame
 	if (_videoFile) {
 		bool endVideo = _vm->_videoPlayer->playFrame();
+		_vm->_musicPlayer->frameTick();
 
 		if (endVideo) {
 			// Close the file
@@ -1491,6 +1492,14 @@ void Script::o_playcd() {
 	_vm->_musicPlayer->playCD(val);
 }
 
+void Script::o_musicdelay() {
+	uint16 delay = readScript16bits();
+
+	debugScript(1, true, "MUSICDELAY %d", delay);
+
+	_vm->_musicPlayer->setBackgroundDelay(delay);
+}
+
 void Script::o_hotspot_outrect() {
 	uint16 left = readScript16bits();
 	uint16 top = readScript16bits();
@@ -1662,7 +1671,7 @@ Script::OpcodeFunc Script::_opcodesT7G[NUM_OPCODES] = {
 	&Script::o_nop8,
 	&Script::o_getcd, // 0x4C
 	&Script::o_playcd,
-	&Script::o_nop16,
+	&Script::o_musicdelay,
 	&Script::o_nop16,
 	&Script::o_nop16, // 0x50
 	&Script::o_nop16,
-- 
cgit v1.2.3