From 330f5de78d271ff3c162fe176c788f4ddf5e91fb Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Wed, 5 Jun 2024 21:48:07 +0200 Subject: [PATCH] Rename ot mStatic --- apps/openmw/mwworld/store.cpp | 10 +++++----- apps/openmw/mwworld/store.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp index a98f06a64af..1e92df85ecb 100644 --- a/apps/openmw/mwworld/store.cpp +++ b/apps/openmw/mwworld/store.cpp @@ -386,15 +386,15 @@ namespace MWWorld auto mapping = mMappings.find(PluginIndex{ plugin, index }); if (mapping == mMappings.end()) return nullptr; - auto texture = mTextures.find(mapping->second); - if (texture == mTextures.end()) + auto texture = mStatic.find(mapping->second); + if (texture == mStatic.end()) return nullptr; return &texture->second; } size_t Store::getSize() const { - return mTextures.size(); + return mStatic.size(); } RecordId Store::load(ESM::ESMReader& esm) @@ -408,7 +408,7 @@ namespace MWWorld if (!isDeleted) { - mTextures[lt.mId] = std::move(lt.mTexture); + mStatic[lt.mId] = std::move(lt.mTexture); mMappings.emplace(PluginIndex{ plugin, lt.mIndex }, lt.mId); } @@ -417,7 +417,7 @@ namespace MWWorld bool Store::eraseStatic(const ESM::RefId& id) { - mTextures.erase(id); + mStatic.erase(id); return true; } diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp index 91ac15885cf..5ce287c34ee 100644 --- a/apps/openmw/mwworld/store.hpp +++ b/apps/openmw/mwworld/store.hpp @@ -256,7 +256,7 @@ namespace MWWorld class Store : public DynamicStore { using PluginIndex = std::pair; // This is essentially a FormId - std::unordered_map mTextures; + std::unordered_map mStatic; std::map mMappings; public: