mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:53:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'localworkaround'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-02-23 20:50:22 +01:00
commit 9a03b17b2d
2 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
apps/openmw/mwscript/scriptmanagerimp.cpp
View file

@ -140,25 +140,42 @@ namespace MWScript
Compiler::Locals& ScriptManager::getLocals (const std::string& name)
{
ScriptCollection::iterator iter = mScripts.find (name);
if (iter==mScripts.end())
{
if (!compile (name))
{
/// \todo Handle case of cyclic member variable access. Currently this could look up
/// the whole application in an endless recursion.
ScriptCollection::iterator iter = mScripts.find (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);
if (iter!=mScripts.end())
return iter->second.second;
}
return iter->second.second;
{
std::map<std::string, Compiler::Locals>::iterator iter = mOtherLocals.find (name);
if (iter!=mOtherLocals.end())
return iter->second;
}
Compiler::Locals locals;
if (const ESM::Script *script = mStore.get<ESM::Script>().find (name))
{
int index = 0;
for (int i=0; i<script->mData.mNumShorts; ++i)
locals.declare ('s', script->mVarNames[index++]);
for (int i=0; i<script->mData.mNumLongs; ++i)
locals.declare ('l', script->mVarNames[index++]);
for (int i=0; i<script->mData.mNumFloats; ++i)
locals.declare ('f', script->mVarNames[index++]);
std::map<std::string, Compiler::Locals>::iterator iter =
mOtherLocals.insert (std::make_pair (name, locals)).first;
return iter->second;
}
throw std::logic_error ("script " + name + " does not exist");
}
GlobalScripts& ScriptManager::getGlobalScripts()

1
apps/openmw/mwscript/scriptmanagerimp.hpp
View file

@ -47,6 +47,7 @@ namespace MWScript
ScriptCollection mScripts;
GlobalScripts mGlobalScripts;
std::map<std::string, Compiler::Locals> mOtherLocals;
public: