diff options
| -rw-r--r-- | engines/director/director.cpp | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp index 1c7fec17d6..c6806e8de2 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -53,17 +53,17 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam // Setup mixer syncSoundSettings(); - _sharedCasts = new Common::HashMap<int, Cast *>; - _sharedDIB = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>; - _sharedBMP = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>; - _sharedSTXT = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>; - _sharedSound = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>; - - _mainArchive = 0; - _macBinary = 0; - //FIXME - _sharedMMM = "SHARDCST.MMM"; - _movies = new Common::HashMap<Common::String, Score *>; + + _sharedCasts = nullptr; + _sharedSound = nullptr; + _sharedBMP = nullptr; + _sharedSTXT = nullptr; + _sharedDIB = nullptr; + + _mainArchive = nullptr; + _macBinary = nullptr; + + _movies = nullptr; const Common::FSNode gameDataDir(ConfMan.get("path")); SearchMan.addSubDirectoryMatching(gameDataDir, "data"); @@ -89,13 +89,9 @@ DirectorEngine::~DirectorEngine() { Common::Error DirectorEngine::run() { debug("Starting v%d Director game", getVersion()); - _sharedCasts = nullptr; - _sharedSound = nullptr; - _sharedBMP = nullptr; - _sharedSTXT = nullptr; - _sharedDIB = nullptr; + //FIXME + _sharedMMM = "SHARDCST.MMM"; - _movies = nullptr; _currentPalette = nullptr; _macBinary = nullptr; |