libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-16 23:19:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DIRECTOR: Fix cast scanning

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-08-29 18:19:18 +02:00
parent d5009ee5c1
commit 64587bbac7
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/director/archive.cpp
View File

@ -191,7 +191,7 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
shardcst->openFile(filename);
Score *castScore = new Score(this);
Score *castScore = new Score(this, shardcst);
Common::SeekableSubReadStreamEndian *castStream = shardcst->getResource(MKTAG('V','W','C','R'), 1024);
castScore->loadCastData(*castStream);

4
engines/director/director.cpp
View File

@ -114,7 +114,7 @@ Common::Error DirectorEngine::run() {
loadMMMNames(ConfMan.get("path"));
loadMainArchive();
_currentScore = new Score(this);
_currentScore = new Score(this, _mainArchive);
debug(0, "Score name %s", _currentScore->getMacName().c_str());
_currentScore->loadArchive();
@ -149,7 +149,7 @@ Common::HashMap<Common::String, Score *> DirectorEngine::loadMMMNames(Common::St
Archive *arc = createArchive();
arc->openFile(i->getPath());
Score *sc = new Score(this);
Score *sc = new Score(this, arc);
nameMap[sc->getMacName()] = sc;
}
}

4
engines/director/score.cpp
View File

@ -87,11 +87,11 @@ static byte defaultPalette[768] = {
204, 51, 255, 204, 102, 255, 204, 153, 255, 204, 204, 255, 204, 255, 255, 255,
0, 255, 255, 51, 255, 255, 102, 255, 255, 153, 255, 255, 204, 255, 255, 255 };
Score::Score(DirectorEngine *vm) {
Score::Score(DirectorEngine *vm, Archive *archive) {
_vm = vm;
_surface = new Graphics::ManagedSurface;
_trailSurface = new Graphics::ManagedSurface;
_movieArchive = _vm->getMainArchive();
_movieArchive = archive;
_lingo = _vm->getLingo();
_soundManager = _vm->getSoundManager();
_lingo->processEvent(kEventPrepareMovie, 0);

2
engines/director/score.h
View File

@ -170,7 +170,7 @@ struct Label {
class Score {
public:
Score(DirectorEngine *vm);
Score(DirectorEngine *vm, Archive *);
~Score();
static Common::Rect readRect(Common::SeekableSubReadStreamEndian &stream);