mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:59:54 +00:00
Code Issues Releases Wiki Activity

Add fallbacks to Store<ESM::GameSetting>

Browse source
This commit is contained in:
Petr Mikheev 2023-06-11 18:55:56 +02:00
parent be45b8199e
commit 96399b3d23
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwworld/store.cpp
View file

@ -10,6 +10,7 @@
#include <components/esm3/esmwriter.hpp> #include <components/esm3/esmwriter.hpp>
#include <components/esm4/loadland.hpp> #include <components/esm4/loadland.hpp>
#include <components/esm4/loadwrld.hpp> #include <components/esm4/loadwrld.hpp>
#include <components/fallback/fallback.hpp>
#include <components/loadinglistener/loadinglistener.hpp> #include <components/loadinglistener/loadinglistener.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
@ -980,6 +981,24 @@ namespace MWWorld
return TypedDynamicStore::search(ESM::RefId::stringRefId(id)); return TypedDynamicStore::search(ESM::RefId::stringRefId(id));
} }
void Store<ESM::GameSetting>::setUp()
{
auto addSetting = [&](const std::string& key, ESM::Variant value) {
ESM::GameSetting setting;
setting.blank();
setting.mId = ESM::RefId::stringRefId(key);
setting.mValue = std::move(value);
mStatic.emplace(setting.mId, std::move(setting));
};
for (auto& [key, value] : Fallback::Map::getIntFallbackMap())
addSetting(key, ESM::Variant(value));
for (auto& [key, value] : Fallback::Map::getFloatFallbackMap())
addSetting(key, ESM::Variant(value));
for (auto& [key, value] : Fallback::Map::getNonNumericFallbackMap())
addSetting(key, ESM::Variant(value));
TypedDynamicStore<ESM::GameSetting>::setUp();
}
// Magic effect // Magic effect
//========================================================================= //=========================================================================
Store<ESM::MagicEffect>::Store() {} Store<ESM::MagicEffect>::Store() {}

2
apps/openmw/mwworld/store.hpp
View file

@ -292,6 +292,8 @@ namespace MWWorld
const ESM::GameSetting* find(const std::string_view id) const; const ESM::GameSetting* find(const std::string_view id) const;
const ESM::GameSetting* search(const std::string_view id) const; const ESM::GameSetting* search(const std::string_view id) const;
void setUp() override;
}; };
template <> template <>

7
components/fallback/fallback.hpp
View file

@ -19,6 +19,13 @@ namespace Fallback
public: public:
static void init(const std::map<std::string, std::string>& fallback); static void init(const std::map<std::string, std::string>& fallback);
static const std::map<std::string, int, std::less<>>& getIntFallbackMap() { return mIntFallbackMap; }
static const std::map<std::string, float, std::less<>>& getFloatFallbackMap() { return mFloatFallbackMap; }
static const std::map<std::string, std::string, std::less<>>& getNonNumericFallbackMap()
{
return mNonNumericFallbackMap;
}
static std::string_view getString(std::string_view fall); static std::string_view getString(std::string_view fall);
static float getFloat(std::string_view fall); static float getFloat(std::string_view fall);
static int getInt(std::string_view fall); static int getInt(std::string_view fall);