mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 02:11:32 +00:00
Code Issues Releases Wiki Activity

Use ESM::RefId as key in TestInterpreterContext::mMembers

Browse source
This commit is contained in:
elsid 2023-03-02 23:14:09 +01:00
parent 3c9dbb11cc
commit eb17f0ba06
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw_test_suite/mwscript/test_utils.hpp
View file

@ -144,7 +144,7 @@ namespace
class TestInterpreterContext : public Interpreter::Context class TestInterpreterContext : public Interpreter::Context
{ {
LocalVariables mLocals; LocalVariables mLocals;
std::map<std::string, GlobalVariables, Misc::StringUtils::CiComp> mMembers; std::map<ESM::RefId, GlobalVariables> mMembers;
public: public:
const ESM::RefId& getTarget() const override { return ESM::RefId::sEmpty; } const ESM::RefId& getTarget() const override { return ESM::RefId::sEmpty; }
@ -209,7 +209,7 @@ namespace
int getMemberShort(const ESM::RefId& id, std::string_view name, bool global) const override int getMemberShort(const ESM::RefId& id, std::string_view name, bool global) const override
{ {
auto it = mMembers.find(id.getRefIdString()); auto it = mMembers.find(id);
if (it != mMembers.end()) if (it != mMembers.end())
return it->second.getShort(name); return it->second.getShort(name);
return {}; return {};
@ -217,7 +217,7 @@ namespace
int getMemberLong(const ESM::RefId& id, std::string_view name, bool global) const override int getMemberLong(const ESM::RefId& id, std::string_view name, bool global) const override
{ {
auto it = mMembers.find(id.getRefIdString()); auto it = mMembers.find(id);
if (it != mMembers.end()) if (it != mMembers.end())
return it->second.getLong(name); return it->second.getLong(name);
return {}; return {};
@ -225,7 +225,7 @@ namespace
float getMemberFloat(const ESM::RefId& id, std::string_view name, bool global) const override float getMemberFloat(const ESM::RefId& id, std::string_view name, bool global) const override
{ {
auto it = mMembers.find(id.getRefIdString()); auto it = mMembers.find(id);
if (it != mMembers.end()) if (it != mMembers.end())
return it->second.getFloat(name); return it->second.getFloat(name);
return {}; return {};
@ -233,17 +233,17 @@ namespace
void setMemberShort(const ESM::RefId& id, std::string_view name, int value, bool global) override void setMemberShort(const ESM::RefId& id, std::string_view name, int value, bool global) override
{ {
mMembers[id.getRefIdString()].setShort(name, value); mMembers[id].setShort(name, value);
} }
void setMemberLong(const ESM::RefId& id, std::string_view name, int value, bool global) override void setMemberLong(const ESM::RefId& id, std::string_view name, int value, bool global) override
{ {
mMembers[id.getRefIdString()].setLong(name, value); mMembers[id].setLong(name, value);
} }
void setMemberFloat(const ESM::RefId& id, std::string_view name, float value, bool global) override void setMemberFloat(const ESM::RefId& id, std::string_view name, float value, bool global) override
{ {
mMembers[id.getRefIdString()].setFloat(name, value); mMembers[id].setFloat(name, value);
} }
}; };