From af3ca5ba0d327c26d1298657d54f5f9dd59715f9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 2 Aug 2016 22:25:00 +0300
Subject: DIRECTOR: Correct startup sequence

---
 engines/director/director.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'engines/director/director.cpp')

diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 58a5459602..1c7fec17d6 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -114,19 +114,20 @@ Common::Error DirectorEngine::run() {
 	}
 
 	//FIXME
-	_mainArchive = new RIFFArchive();
-	_mainArchive->openFile("bookshelf_example.mmm");
-	_currentScore = new Score(this);
-	debug(0, "Score name %s", _currentScore->getMacName().c_str());
-
-	_currentScore->loadArchive();
-	_currentScore->startLoop();
+	//_mainArchive = new RIFFArchive();
+	//_mainArchive->openFile("bookshelf_example.mmm");
 
 	if (getPlatform() == Common::kPlatformWindows)
 		loadEXE();
 	else
 		loadMac();
 
+	_currentScore = new Score(this);
+	debug(0, "Score name %s", _currentScore->getMacName().c_str());
+
+	_currentScore->loadArchive();
+	_currentScore->startLoop();
+
 	return Common::kNoError;
 }
 
-- 
cgit v1.2.3