diff options
| author | Matthew Hoops | 2011-01-18 20:30:16 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2011-01-18 20:30:16 +0000 |
| commit | 0761ab7b3a5789815e65e49d40d92539f10c481c (patch) | |
| tree | 7d67b9c3714cca45e5a1597bba1a00cc39abfcd4 /engines/mohawk/riven_scripts.cpp | |
| parent | bf06c49544a63f927889e20617b2b1c3edc815a4 (diff) | |
| download | scummvm-rg350-0761ab7b3a5789815e65e49d40d92539f10c481c.tar.gz scummvm-rg350-0761ab7b3a5789815e65e49d40d92539f10c481c.tar.bz2 scummvm-rg350-0761ab7b3a5789815e65e49d40d92539f10c481c.zip | |
MOHAWK: Rename some VideoManager functions so we have some unified naming between versions
svn-id: r55312
Diffstat (limited to 'engines/mohawk/riven_scripts.cpp')
| -rw-r--r-- | engines/mohawk/riven_scripts.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 8d0743340c..789f42ed82 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -132,8 +132,8 @@ void RivenScript::setupOpcodes() { OPCODE(empty), // Set movie rate (not used) OPCODE(enableMovie), // 0x20 (32 decimal) + OPCODE(playMovieBlocking), OPCODE(playMovie), - OPCODE(playMovieBg), OPCODE(stopMovie), OPCODE(empty), // Start a water effect (not used) // 0x24 (36 decimal) @@ -476,7 +476,7 @@ void RivenScript::changeStack(uint16 op, uint16 argc, uint16 *argv) { // Command 28: disable a movie void RivenScript::disableMovie(uint16 op, uint16 argc, uint16 *argv) { - _vm->_video->disableMovie(argv[0]); + _vm->_video->disableMovieRiven(argv[0]); } // Command 29: disable all movies @@ -486,24 +486,24 @@ void RivenScript::disableAllMovies(uint16 op, uint16 argc, uint16 *argv) { // Command 31: enable a movie void RivenScript::enableMovie(uint16 op, uint16 argc, uint16 *argv) { - _vm->_video->enableMovie(argv[0]); + _vm->_video->enableMovieRiven(argv[0]); } // Command 32: play foreground movie - blocking (movie_id) -void RivenScript::playMovie(uint16 op, uint16 argc, uint16 *argv) { +void RivenScript::playMovieBlocking(uint16 op, uint16 argc, uint16 *argv) { CursorMan.showMouse(false); // Hide the cursor before playing the video - _vm->_video->playMovieBlocking(argv[0]); + _vm->_video->playMovieBlockingRiven(argv[0]); CursorMan.showMouse(true); // Show the cursor again when we're done ;) } // Command 33: play background movie - nonblocking (movie_id) -void RivenScript::playMovieBg(uint16 op, uint16 argc, uint16 *argv) { - _vm->_video->playMovie(argv[0]); +void RivenScript::playMovie(uint16 op, uint16 argc, uint16 *argv) { + _vm->_video->playMovieRiven(argv[0]); } // Command 34: stop a movie void RivenScript::stopMovie(uint16 op, uint16 argc, uint16 *argv) { - _vm->_video->stopMovie(argv[0]); + _vm->_video->stopMovieRiven(argv[0]); } // Command 36: unknown @@ -553,7 +553,7 @@ void RivenScript::activateSLST(uint16 op, uint16 argc, uint16 *argv) { // Command 41: activate MLST record and play void RivenScript::activateMLSTAndPlay(uint16 op, uint16 argc, uint16 *argv) { _vm->_video->activateMLST(argv[0], _vm->getCurCard()); - _vm->_video->playMovie(argv[0]); + _vm->_video->playMovieRiven(argv[0]); } // Command 43: activate BLST record (card hotspot enabling lists) |