aboutsummaryrefslogtreecommitdiff
path: root/engines/director/director.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-06-18 15:08:02 +0200
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commit6cb2a3cd00ea2c88564ade88707e693102e661cf (patch)
treeaf6d29b9243fbb692054b967ba75c9a032f59ec3 /engines/director/director.cpp
parentbb7125620d2f0919fcf671b50644af3acef39cbf (diff)
downloadscummvm-rg350-6cb2a3cd00ea2c88564ade88707e693102e661cf.tar.gz
scummvm-rg350-6cb2a3cd00ea2c88564ade88707e693102e661cf.tar.bz2
scummvm-rg350-6cb2a3cd00ea2c88564ade88707e693102e661cf.zip
DIRECTOR: Fix crash on exit
Diffstat (limited to 'engines/director/director.cpp')
-rw-r--r--engines/director/director.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index ce6732983e..fb93400c52 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -55,6 +55,7 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
_mainArchive = 0;
_macBinary = 0;
+ _currentPalette = 0;
const Common::FSNode gameDataDir(ConfMan.get("path"));
SearchMan.addSubDirectoryMatching(gameDataDir, "data");
@@ -75,12 +76,12 @@ Common::Error DirectorEngine::run() {
_lingo->addCode("mci \"open MM\\T005045a.wav type WaveAudio alias T005045a\"\n\
mci \"play T005045a from 22710 to 32872\"", kMovieScript, 1);
-#if 0
- _lingo->addCode("set x = 1\n\
+ _lingo->addCode("set x = 1 + 3\n\
set y to 2 -- this set y to 4\n\
put 5 into z\n\
-- some more\n", kMovieScript, 2);
-#endif
+
+ return Common::kNoError;
//FIXME
_mainArchive = new RIFFArchive();