DIRECTOR: Fix numerous crashes on destruction

This commit is contained in:
Eugene Sandulenko 2016-08-25 09:54:25 +02:00
parent 03cf470082
commit a5b97a989c
2 changed files with 2 additions and 5 deletions

View File

@ -73,14 +73,12 @@ DirectorEngine::~DirectorEngine() {
delete _sharedBMP;
delete _sharedSTXT;
delete _sharedDIB;
delete _movies;
delete _currentScore;
delete _mainArchive;
delete _macBinary;
delete _soundManager;
delete _lingo;
delete _currentScore;
delete _currentPalette;
}
Common::Error DirectorEngine::run() {

View File

@ -97,6 +97,7 @@ Score::Score(DirectorEngine *vm) {
_lingo->processEvent(kEventPrepareMovie, 0);
_movieScriptCount = 0;
_labels = NULL;
_font = NULL;
if (_movieArchive->hasResource(MKTAG('M','C','N','M'), 0)) {
_macName = _movieArchive->getName(MKTAG('M','C','N','M'), 0).c_str();
@ -181,8 +182,6 @@ Score::~Score() {
_movieArchive->close();
delete _font;
delete _movieArchive;
delete _labels;
}