thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Rename some VideoManager functions so we have some unified naming between versions

Browse source 
svn-id: r55312
This commit is contained in:
Matthew Hoops 2011-01-18 20:30:16 +00:00
parent bf06c49544
commit 0761ab7b3a
17 changed files with 162 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/mohawk/riven_scripts.cpp
View file

@ -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)