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

MUTATIONOFJB: Run extra sections from conversation.

Browse source
This commit is contained in:
Ľubomír Remák 2018-07-15 15:52:29 +02:00 • committed by Eugene Sandulenko
parent d22da95282
commit d358a65bbc
8 changed files with 119 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
engines/mutationofjb/script.cpp
View file

@ -189,6 +189,23 @@ Command *ScriptExecutionContext::getMacro(const Common::String &name) const {
return cmd;
}
Command *ScriptExecutionContext::getExtra(const Common::String &name) const {
Command *cmd = nullptr;
Script *const localScript = _localScriptOverride ? _localScriptOverride : _game.getLocalScript();
Script *const globalScript = _game.getGlobalScript();
if (localScript) {
cmd = localScript->getExtra(name);
}
if (!cmd && globalScript) {
cmd = globalScript->getExtra(name);
}
return cmd;
}
bool Script::loadFromStream(Common::SeekableReadStream &stream) {
destroy();
@ -236,6 +253,7 @@ bool Script::loadFromStream(Common::SeekableReadStream &stream) {
_macros = parseCtx._macros;
_startups = parseCtx._startups;
_extras = parseCtx._extras;
return true;
}
@ -285,4 +303,13 @@ Command *Script::getStartup(uint8 startupId) const {
return it->_value;
}
Command *Script::getExtra(const Common::String &name) const {
Extras::const_iterator it = _extras.find(name);
if (it == _extras.end()) {
return nullptr;
}
return it->_value;
}
}