mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-12 13:13:27 +00:00
Code Issues Projects Releases Wiki Activity

Use ESM::RefId as key for ScriptContext::mLocals

Browse Source
This commit is contained in:
elsid 2023-03-03 13:34:40 +01:00
parent 3975003778
commit 7daef583cb
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/world/scriptcontext.cpp
View File

@ -85,7 +85,7 @@ std::pair<char, bool> CSMWorld::ScriptContext::getMemberType(const std::string&
if (index == -1) if (index == -1)
return std::make_pair(' ', false); return std::make_pair(' ', false);
std::map<std::string, Compiler::Locals>::iterator iter = mLocals.find(id2.getRefIdString()); auto iter = mLocals.find(id2);
if (iter == mLocals.end()) if (iter == mLocals.end())
{ {
@ -97,7 +97,7 @@ std::pair<char, bool> CSMWorld::ScriptContext::getMemberType(const std::string&
Compiler::Scanner scanner(errorHandler, stream, getExtensions()); Compiler::Scanner scanner(errorHandler, stream, getExtensions());
scanner.scan(parser); scanner.scan(parser);
iter = mLocals.insert(std::make_pair(id2.getRefIdString(), locals)).first; iter = mLocals.emplace(id2, std::move(locals)).first;
} }
return std::make_pair(iter->second.getType(Misc::StringUtils::lowerCase(name)), reference); return std::make_pair(iter->second.getType(Misc::StringUtils::lowerCase(name)), reference);
@ -131,7 +131,7 @@ void CSMWorld::ScriptContext::clear()
bool CSMWorld::ScriptContext::clearLocals(const std::string& script) bool CSMWorld::ScriptContext::clearLocals(const std::string& script)
{ {
std::map<std::string, Compiler::Locals>::iterator iter = mLocals.find(script); const auto iter = mLocals.find(script);
if (iter != mLocals.end()) if (iter != mLocals.end())
{ {

2
apps/opencs/model/world/scriptcontext.hpp
View File

@ -19,7 +19,7 @@ namespace CSMWorld
const Data& mData; const Data& mData;
mutable std::vector<ESM::RefId> mIds; mutable std::vector<ESM::RefId> mIds;
mutable bool mIdsUpdated; mutable bool mIdsUpdated;
mutable std::map<std::string, Compiler::Locals, Misc::StringUtils::CiComp> mLocals; mutable std::map<ESM::RefId, Compiler::Locals, std::less<>> mLocals;
public: public:
ScriptContext(const Data& data); ScriptContext(const Data& data);