libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 03:31:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Let Cast class manage registering the archive

Browse Source 
This fixes a null pointer crash and potential issues when switching between movies.
This commit is contained in:
Henrik "Henke37" Andersson 2022-06-21 12:10:31 +02:00 committed by Eugene Sandulenko
parent 761c99cbd8
commit 1b6e2335b3
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/director/cast.cpp
View File

@ -93,6 +93,9 @@ Cast::~Cast() {
if (_castArchive) {
_castArchive->close();
g_director->_openResFiles.erase(_castArchive->getPathName());
delete _castArchive;
_castArchive = nullptr;
}
@ -197,6 +200,9 @@ void Cast::setArchive(Archive *archive) {
} else {
_macName = archive->getFileName();
}
// Register the resfile so that Cursor::readFromResource can find it
g_director->_openResFiles.setVal(archive->getPathName(), archive);
}
void Cast::loadArchive() {

8
engines/director/movie.cpp
View File

@ -95,9 +95,6 @@ Movie::~Movie() {
// _movieArchive is shared with the cast, so the cast will free it
delete _cast;
if (_sharedCast)
g_director->_openResFiles.erase(_sharedCast->getArchive()->getPathName());
delete _sharedCast;
delete _score;
}
@ -284,8 +281,6 @@ void Movie::clearSharedCast() {
if (!_sharedCast)
return;
g_director->_openResFiles.erase(_sharedCast->getArchive()->getPathName());
delete _sharedCast;
_sharedCast = nullptr;
@ -312,9 +307,6 @@ void Movie::loadSharedCastsFrom(Common::String filename) {
_sharedCast = new Cast(this, 0, true);
_sharedCast->setArchive(sharedCast);
_sharedCast->loadArchive();
// Register the resfile so that Cursor::readFromResource can find it
g_director->_openResFiles.setVal(sharedCast->getPathName(), sharedCast);
}
CastMember *Movie::getCastMember(CastMemberID memberID) {