mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-05 19:19:44 +00:00
Code Issues Releases Wiki Activity

fixed case problem in remote member variable access

Browse source
This commit is contained in:
Marc Zinnschlag 2014-02-11 13:56:56 +01:00
parent f26aa4f645
commit 9de2922d22
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,12 +7,15 @@
#include <exception> #include <exception>
#include <components/esm/loadscpt.hpp> #include <components/esm/loadscpt.hpp>
#include "../mwworld/esmstore.hpp"
#include <components/misc/stringops.hpp>
#include <components/compiler/scanner.hpp> #include <components/compiler/scanner.hpp>
#include <components/compiler/context.hpp> #include <components/compiler/context.hpp>
#include <components/compiler/exception.hpp> #include <components/compiler/exception.hpp>
#include "../mwworld/esmstore.hpp"
#include "extensions.hpp" #include "extensions.hpp"
namespace MWScript namespace MWScript
@ -140,15 +143,17 @@ namespace MWScript
Compiler::Locals& ScriptManager::getLocals (const std::string& name) Compiler::Locals& ScriptManager::getLocals (const std::string& name)
{ {
std::string name2 = Misc::StringUtils::lowerCase (name);
{ {
ScriptCollection::iterator iter = mScripts.find (name); ScriptCollection::iterator iter = mScripts.find (name2);
if (iter!=mScripts.end()) if (iter!=mScripts.end())
return iter->second.second; return iter->second.second;
} }
{ {
std::map<std::string, Compiler::Locals>::iterator iter = mOtherLocals.find (name); std::map<std::string, Compiler::Locals>::iterator iter = mOtherLocals.find (name2);
if (iter!=mOtherLocals.end()) if (iter!=mOtherLocals.end())
return iter->second; return iter->second;
@ -156,7 +161,7 @@ namespace MWScript
Compiler::Locals locals; Compiler::Locals locals;
if (const ESM::Script *script = mStore.get<ESM::Script>().find (name)) if (const ESM::Script *script = mStore.get<ESM::Script>().find (name2))
{ {
int index = 0; int index = 0;
@ -170,7 +175,7 @@ namespace MWScript
locals.declare ('f', script->mVarNames[index++]); locals.declare ('f', script->mVarNames[index++]);
std::map<std::string, Compiler::Locals>::iterator iter = std::map<std::string, Compiler::Locals>::iterator iter =
mOtherLocals.insert (std::make_pair (name, locals)).first; mOtherLocals.insert (std::make_pair (name2, locals)).first;
return iter->second; return iter->second;
} }