diff options
| author | Bastien Bouclet | 2017-02-20 18:02:57 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-03 08:50:10 +0200 |
| commit | f977b5712328133b638c33992d4e111624d1881d (patch) | |
| tree | c8480f6b0f9f3f2471f44fa09c894015fdc49ba1 /engines/mohawk/riven_stacks/pspit.cpp | |
| parent | 9153393219b398ce5a7a8122d9af38e32e128059 (diff) | |
| download | scummvm-rg350-f977b5712328133b638c33992d4e111624d1881d.tar.gz scummvm-rg350-f977b5712328133b638c33992d4e111624d1881d.tar.bz2 scummvm-rg350-f977b5712328133b638c33992d4e111624d1881d.zip | |
MOHAWK: Rewrite the Riven movie manager
Diffstat (limited to 'engines/mohawk/riven_stacks/pspit.cpp')
| -rw-r--r-- | engines/mohawk/riven_stacks/pspit.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/engines/mohawk/riven_stacks/pspit.cpp b/engines/mohawk/riven_stacks/pspit.cpp index e2bfec0f95..63f921dcd9 100644 --- a/engines/mohawk/riven_stacks/pspit.cpp +++ b/engines/mohawk/riven_stacks/pspit.cpp @@ -26,6 +26,7 @@ #include "mohawk/riven.h" #include "mohawk/riven_card.h" #include "mohawk/riven_sound.h" +#include "mohawk/riven_video.h" namespace Mohawk { namespace RivenStacks { @@ -33,13 +34,13 @@ namespace RivenStacks { PSpit::PSpit(MohawkEngine_Riven *vm) : DomeSpit(vm, kStackPspit, "psliders.25", "psliderbg.25") { - REGISTER_COMMAND(PSpit, xpisland990_elevcombo); - REGISTER_COMMAND(PSpit, xpscpbtn); - REGISTER_COMMAND(PSpit, xpisland290_domecheck); - REGISTER_COMMAND(PSpit, xpisland25_opencard); - REGISTER_COMMAND(PSpit, xpisland25_resetsliders); - REGISTER_COMMAND(PSpit, xpisland25_slidermd); - REGISTER_COMMAND(PSpit, xpisland25_slidermw); +// REGISTER_COMMAND(PSpit, xpisland990_elevcombo); +// REGISTER_COMMAND(PSpit, xpscpbtn); +// REGISTER_COMMAND(PSpit, xpisland290_domecheck); +// REGISTER_COMMAND(PSpit, xpisland25_opencard); +// REGISTER_COMMAND(PSpit, xpisland25_resetsliders); +// REGISTER_COMMAND(PSpit, xpisland25_slidermd); +// REGISTER_COMMAND(PSpit, xpisland25_slidermw); } void PSpit::catherineIdleTimer() { @@ -67,9 +68,10 @@ void PSpit::catherineIdleTimer() { cathState = 1; // Play the movie, blocking - _vm->_video->activateMLST(_vm->getCard()->getMovie(movie)); + _vm->getCard()->playMovie(movie); _vm->_cursor->hideCursor(); - _vm->_video->playMovieBlockingRiven(movie); + RivenVideo *video = _vm->_video->openSlot(movie); + video->playBlocking(); _vm->_cursor->showCursor(); _vm->_system->updateScreen(); |