diff options
| author | ImperishableSecret <57067794+imperishableSecret@users.noreply.github.com> | 2026-05-07 01:18:30 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-06 20:48:30 +0100 |
| commit | 336dc6c04e5bd0b1ebeadab81970da6367345f4f (patch) | |
| tree | a058ecbe84a64d5af606c77264d6fa2fea7f92db /src/config/lua/ConfigManager.cpp | |
| parent | 1681bea42dd2f11ba3fe6df05560d0b231de3c76 (diff) | |
config/lua: fix device bool int reads (#14313)
* config/lua: fix device bool int reads
* config/lua: fix device typed reads
Diffstat (limited to 'src/config/lua/ConfigManager.cpp')
| -rw-r--r-- | src/config/lua/ConfigManager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/config/lua/ConfigManager.cpp b/src/config/lua/ConfigManager.cpp index 0fe75b18..0dd96200 100644 --- a/src/config/lua/ConfigManager.cpp +++ b/src/config/lua/ConfigManager.cpp @@ -712,18 +712,18 @@ ILuaConfigValue* CConfigManager::findDeviceValue(const std::string& dev, const s int CConfigManager::getDeviceInt(const std::string& dev, const std::string& field, const std::string& fb) { std::string fallback = luaConfigValueName(fb); if (auto* v = findDeviceValue(normalizeDeviceName(dev), luaConfigValueName(field)); v && v->setByUser()) - return (int)*sc<const Config::INTEGER*>(v->data()); + return v->asInt(); if (!fallback.empty() && m_configValues.contains(fallback)) - return (int)*sc<const Config::INTEGER*>(m_configValues.at(fallback)->data()); + return m_configValues.at(fallback)->asInt(); return 0; } float CConfigManager::getDeviceFloat(const std::string& dev, const std::string& field, const std::string& fb) { std::string fallback = luaConfigValueName(fb); if (auto* v = findDeviceValue(normalizeDeviceName(dev), luaConfigValueName(field)); v && v->setByUser()) - return *sc<const Config::FLOAT*>(v->data()); + return v->asFloat(); if (!fallback.empty() && m_configValues.contains(fallback)) - return *sc<const Config::FLOAT*>(m_configValues.at(fallback)->data()); + return m_configValues.at(fallback)->asFloat(); return 0.F; } @@ -731,9 +731,9 @@ Vector2D CConfigManager::getDeviceVec(const std::string& dev, const std::string& std::string fallback = luaConfigValueName(fb); auto toVec = [](const Config::VEC2& v) -> Vector2D { return {v.x, v.y}; }; if (auto* v = findDeviceValue(normalizeDeviceName(dev), luaConfigValueName(field)); v && v->setByUser()) - return toVec(*sc<const Config::VEC2*>(v->data())); + return toVec(v->asVec2()); if (!fallback.empty() && m_configValues.contains(fallback)) - return toVec(*sc<const Config::VEC2*>(m_configValues.at(fallback)->data())); + return toVec(m_configValues.at(fallback)->asVec2()); return {0, 0}; } @@ -741,9 +741,9 @@ std::string CConfigManager::getDeviceString(const std::string& dev, const std::s std::string fallback = luaConfigValueName(fb); auto clean = [](const Config::STRING& s) -> std::string { return s == STRVAL_EMPTY ? "" : s; }; if (auto* v = findDeviceValue(normalizeDeviceName(dev), luaConfigValueName(field)); v && v->setByUser()) - return clean(*sc<const Config::STRING*>(v->data())); + return clean(v->asString()); if (!fallback.empty() && m_configValues.contains(fallback)) - return clean(*sc<const Config::STRING*>(m_configValues.at(fallback)->data())); + return clean(m_configValues.at(fallback)->asString()); return ""; } |
