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

MOHAWK: Use movie slots instead of movie ids for stored opcodes

Browse source 
Fixes Trac#9873.
This commit is contained in:
Bastien Bouclet 2017-07-05 19:10:41 +02:00
parent afe27c6de8
commit 31d428fd02
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/mohawk/riven_scripts.cpp
View file

@ -47,7 +47,7 @@ RivenScriptManager::RivenScriptManager(MohawkEngine_Riven *vm) :
_stoppingAllScripts(false) {
_storedMovieOpcode.time = 0;
_storedMovieOpcode.id = 0;
_storedMovieOpcode.slot = 0;
}
RivenScriptManager::~RivenScriptManager() {
@ -101,7 +101,7 @@ void RivenScriptManager::stopAllScripts() {
void RivenScriptManager::setStoredMovieOpcode(const StoredMovieOpcode &op) {
clearStoredMovieOpcode();
_storedMovieOpcode.script = op.script;
_storedMovieOpcode.id = op.id;
_storedMovieOpcode.slot = op.slot;
_storedMovieOpcode.time = op.time;
}
@ -115,7 +115,7 @@ void RivenScriptManager::runStoredMovieOpcode() {
void RivenScriptManager::clearStoredMovieOpcode() {
_storedMovieOpcode.script = RivenScriptPtr();
_storedMovieOpcode.time = 0;
_storedMovieOpcode.id = 0;
_storedMovieOpcode.slot = 0;
}
void RivenScriptManager::runScript(const RivenScriptPtr &script, bool queue) {
@ -573,7 +573,7 @@ void RivenSimpleCommand::storeMovieOpcode(uint16 op, const ArgumentArray &args)
RivenScriptManager::StoredMovieOpcode storedOp;
storedOp.script = _vm->_scriptMan->createScriptFromData(1, args[3], 1, args[4]);
storedOp.time = delayTime;
storedOp.id = args[0];
storedOp.slot = args[0];
// Store the opcode for later
_vm->_scriptMan->setStoredMovieOpcode(storedOp);