mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-09 03:10:22 +00:00
DIRECTOR: Properly reastart movies
This commit is contained in:
parent
625f3c1c28
commit
0869e02c1b
@ -256,14 +256,21 @@ void DirectorEngine::clearSharedCast() {
|
||||
|
||||
delete _sharedScore;
|
||||
|
||||
_sharedScore = nullptr;
|
||||
|
||||
delete _sharedDIB;
|
||||
delete _sharedSTXT;
|
||||
delete _sharedSound;
|
||||
delete _sharedBMP;
|
||||
|
||||
_sharedDIB = nullptr;
|
||||
_sharedSTXT = nullptr;
|
||||
_sharedSound = nullptr;
|
||||
_sharedBMP = nullptr;
|
||||
}
|
||||
|
||||
void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
|
||||
if (_sharedScore) {
|
||||
if (_sharedScore && _sharedScore->_movieArchive) {
|
||||
if (_sharedScore->_movieArchive->getFileName().equalsIgnoreCase(filename))
|
||||
return;
|
||||
}
|
||||
@ -284,6 +291,8 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
|
||||
if (!shardcst->openFile(filename)) {
|
||||
warning("No shared cast %s", filename.c_str());
|
||||
|
||||
delete shardcst;
|
||||
|
||||
_sharedScore = new Score(this);
|
||||
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user