Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-03 07:17:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

implemented dialogue scripts

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-05 16:56:14 +01:00
parent 65756db49e
commit 69f0ec99f1
6 changed files with 60 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
apps/openmw/mwscript/scriptmanager.cpp
View file

@ -63,7 +63,7 @@ namespace MWScript
{
std::vector<Interpreter::Type_Code> code;
mParser.getCode (code);
mScripts.insert (std::make_pair (name, code));
mScripts.insert (std::make_pair (name, std::make_pair (code, mParser.getLocals())));
// TODO sanity check on generated locals
@ -77,8 +77,7 @@ namespace MWScript
void ScriptManager::run (const std::string& name, Interpreter::Context& interpreterContext)
{
// compile script
std::map<std::string, std::vector<Interpreter::Type_Code> >::iterator iter =
mScripts.find (name);
ScriptCollection::iterator iter = mScripts.find (name);
if (iter==mScripts.end())
{
@ -86,7 +85,7 @@ namespace MWScript
{
// failed -> ignore script from now on.
std::vector<Interpreter::Type_Code> empty;
mScripts.insert (std::make_pair (name, empty));
mScripts.insert (std::make_pair (name, std::make_pair (empty, Compiler::Locals())));
return;
}
@ -95,7 +94,7 @@ namespace MWScript
}
// execute script
if (!iter->second.empty())
if (!iter->second.first.empty())
try
{
if (!mOpcodesInstalled)
@ -104,7 +103,7 @@ namespace MWScript
mOpcodesInstalled = true;
}
mInterpreter.run (&iter->second[0], iter->second.size(), interpreterContext);
mInterpreter.run (&iter->second.first[0], iter->second.first.size(), interpreterContext);
}
catch (const std::exception& e)
{
@ -113,7 +112,7 @@ namespace MWScript
if (mVerbose)
std::cerr << "(" << e.what() << ")" << std::endl;
iter->second.clear(); // don't execute again.
iter->second.first.clear(); // don't execute again.
}
}
@ -132,4 +131,24 @@ namespace MWScript
return std::make_pair (count, success);
}
Compiler::Locals& ScriptManager::getLocals (const std::string& name)
{
ScriptCollection::iterator iter = mScripts.find (name);
if (iter==mScripts.end())
{
if (!compile (name))
{
// failed -> ignore script from now on.
std::vector<Interpreter::Type_Code> empty;
mScripts.insert (std::make_pair (name, std::make_pair (empty, Compiler::Locals())));
throw std::runtime_error ("failed to compile script " + name);
}
iter = mScripts.find (name);
}
return iter->second.second;
}
}