diff options
| author | Bastien Bouclet | 2016-08-13 17:59:47 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-03 08:50:10 +0200 |
| commit | 1a5b2a1e50cbb9067829810d31726a5447b72791 (patch) | |
| tree | 09e40ba72c1fdc719efd65de37fc7a4eb96499ef /engines/mohawk/riven.cpp | |
| parent | 3f1f407c14f72c48f72ae787af0e1e56a09e9da2 (diff) | |
| download | scummvm-rg350-1a5b2a1e50cbb9067829810d31726a5447b72791.tar.gz scummvm-rg350-1a5b2a1e50cbb9067829810d31726a5447b72791.tar.bz2 scummvm-rg350-1a5b2a1e50cbb9067829810d31726a5447b72791.zip | |
MOHAWK: Move MLST loading to RivenCard
Diffstat (limited to 'engines/mohawk/riven.cpp')
| -rw-r--r-- | engines/mohawk/riven.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index b431b971fb..2536b0246f 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -591,7 +591,7 @@ static void catherineIdleTimer(MohawkEngine_Riven *vm) { cathState = 1; // Play the movie, blocking - vm->_video->activateMLST(movie, vm->getCard()->getId()); + vm->_video->activateMLST(vm->getCard()->getMovie(movie)); vm->_cursor->hideCursor(); vm->_video->playMovieBlockingRiven(movie); vm->_cursor->showCursor(); @@ -725,7 +725,7 @@ static void sunnersBeachTimer(MohawkEngine_Riven *vm) { // Unlike the other cards' scripts which automatically // activate the MLST, we have to set it manually here. uint16 mlstID = vm->_rnd->getRandomNumberRng(3, 8); - vm->_video->activateMLST(mlstID, vm->getCard()->getId()); + vm->_video->activateMLST(vm->getCard()->getMovie(mlstID)); VideoEntryPtr video = vm->_video->playMovieRiven(mlstID); timerTime = video->getDuration().msecs() + vm->_rnd->getRandomNumberRng(1, 30) * 1000; |