aboutsummaryrefslogtreecommitdiff
path: root/engines/director/director.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-02 22:25:00 +0300
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commitaf3ca5ba0d327c26d1298657d54f5f9dd59715f9 (patch)
treeece0ffc26c7d2f01fe7f3632c44d3ea6a92e810b /engines/director/director.cpp
parent9067257cf05f9d37d440c5a87100ca4ce829b3c8 (diff)
downloadscummvm-rg350-af3ca5ba0d327c26d1298657d54f5f9dd59715f9.tar.gz
scummvm-rg350-af3ca5ba0d327c26d1298657d54f5f9dd59715f9.tar.bz2
scummvm-rg350-af3ca5ba0d327c26d1298657d54f5f9dd59715f9.zip
DIRECTOR: Correct startup sequence
Diffstat (limited to 'engines/director/director.cpp')
-rw-r--r--engines/director/director.cpp15
1 files changed, 8 insertions, 7 deletions
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;
}