1 files changed, 48 insertions, 22 deletions

diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 9aa190a456..dc533a210a 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -286,10 +286,40 @@ void Inter_v1::o1_loadMult() {
 }
 
 void Inter_v1::o1_playMult() {
-	int16 checkEscape;
+	// NOTE: The EGA version of Gobliiins has an MDY tune.
+	//       While the original doesn't play it, we do.
+	bool isGob1EGAIntro = _vm->getGameType() == kGameTypeGob1  &&
+	                      _vm->isEGA()                         &&
+	                      _vm->_game->_script->pos() == 1010   &&
+	                      _vm->isCurrentTot("intro.tot")       &&
+	                      VAR(57) != 0xFFFFFFFF                &&
+	                      _vm->_dataIO->hasFile("goblins.mdy") &&
+	                      _vm->_dataIO->hasFile("goblins.tbr");
+
+	int16 checkEscape = _vm->_game->_script->readInt16();
+
+	if (isGob1EGAIntro) {
+		_vm->_sound->adlibLoadTBR("goblins.tbr");
+		_vm->_sound->adlibLoadMDY("goblins.mdy");
+		_vm->_sound->adlibSetRepeating(-1);
+
+		_vm->_sound->adlibPlay();
+	}
 
-	checkEscape = _vm->_game->_script->readInt16();
 	_vm->_mult->playMult(VAR(57), -1, checkEscape, 0);
+
+	if (isGob1EGAIntro) {
+
+		// User didn't escape the intro mult, wait for an escape here
+		if (VAR(57) != 0xFFFFFFFF) {
+			while (_vm->_util->getKey() != kKeyEscape) {
+				_vm->_util->processInput();
+				_vm->_util->longDelay(1);
+			}
+		}
+
+		_vm->_sound->adlibUnload();
+	}
 }
 
 void Inter_v1::o1_freeMultKeys() {
@@ -1159,26 +1189,15 @@ void Inter_v1::o1_palLoad(OpFuncParams &params) {
 }
 
 void Inter_v1::o1_keyFunc(OpFuncParams &params) {
-	static uint32 lastCalled = 0;
-	int16 cmd;
-	int16 key;
-	uint32 now;
-
 	if (!_vm->_vidPlayer->isPlayingLive()) {
 		_vm->_draw->forceBlit();
 		_vm->_video->retrace();
 	}
 
-	cmd = _vm->_game->_script->readInt16();
 	animPalette();
 	_vm->_draw->blitInvalidated();
 
-	now = _vm->_util->getTimeKey();
-	if (!_noBusyWait)
-		if ((now - lastCalled) <= 20)
-			_vm->_util->longDelay(1);
-	lastCalled = now;
-	_noBusyWait = false;
+	handleBusyWait();
 
 	// WORKAROUND for bug #1726130: Ween busy-waits in the intro for a counter
 	// to become 5000. We deliberately slow down busy-waiting, so we shorten
@@ -1187,6 +1206,9 @@ void Inter_v1::o1_keyFunc(OpFuncParams &params) {
 	    (_vm->_game->_script->pos() == 729) && _vm->isCurrentTot("intro5.tot"))
 		WRITE_VAR(59, 4000);
 
+	int16 cmd = _vm->_game->_script->readInt16();
+	int16 key;
+
 	switch (cmd) {
 	case -1:
 		break;
@@ -1554,14 +1576,13 @@ void Inter_v1::o1_waitEndPlay(OpFuncParams &params) {
 }
 
 void Inter_v1::o1_playComposition(OpFuncParams &params) {
-	int16 composition[50];
-	int16 dataVar;
-	int16 freqVal;
+	int16 dataVar = _vm->_game->_script->readVarIndex();
+	int16 freqVal = _vm->_game->_script->readValExpr();
 
-	dataVar = _vm->_game->_script->readVarIndex();
-	freqVal = _vm->_game->_script->readValExpr();
+	int16 composition[50];
+	int maxEntries = MIN<int>(50, (_variables->getSize() - dataVar) / 4);
 	for (int i = 0; i < 50; i++)
-		composition[i] = (int16) VAR_OFFSET(dataVar + i * 4);
+		composition[i] = (i < maxEntries) ? ((int16) VAR_OFFSET(dataVar + i * 4)) : -1;
 
 	_vm->_sound->blasterPlayComposition(composition, freqVal);
 }
@@ -1744,10 +1765,15 @@ void Inter_v1::o1_writeData(OpFuncParams &params) {
 void Inter_v1::o1_manageDataFile(OpFuncParams &params) {
 	Common::String file = _vm->_game->_script->evalString();
 
-	if (!file.empty())
+	if (!file.empty()) {
 		_vm->_dataIO->openArchive(file, true);
-	else
+	} else {
 		_vm->_dataIO->closeArchive(true);
+
+		// NOTE: Lost in Time might close a data file without explicitely closing a video in it.
+		//       So we make sure that all open videos are still available.
+		_vm->_vidPlayer->reopenAll();
+	}
 }
 
 void Inter_v1::o1_setState(OpGobParams &params) {