From ec81bd7f1bd5e211e009130477efb7acd52427cd Mon Sep 17 00:00:00 2001 From: Zackhasacat Date: Tue, 7 Nov 2023 12:01:54 -0600 Subject: [PATCH] rename specilizationIndexToLuaId --- apps/openmw/mwlua/classbindings.cpp | 2 +- apps/openmw/mwlua/stats.cpp | 2 +- components/esm3/loadclas.cpp | 2 +- components/esm3/loadclas.hpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/openmw/mwlua/classbindings.cpp b/apps/openmw/mwlua/classbindings.cpp index 24a8e7e2eb..8b277b41fe 100644 --- a/apps/openmw/mwlua/classbindings.cpp +++ b/apps/openmw/mwlua/classbindings.cpp @@ -72,7 +72,7 @@ namespace MWLua }); classT["specialization"] = sol::readonly_property([](const ESM::Class& rec) -> std::string_view { - return ESM::Class::indexToLuaId.at(rec.mData.mSpecialization); + return ESM::Class::specilizationIndexToLuaId.at(rec.mData.mSpecialization); }); classT["isPlayable"] = sol::readonly_property([](const ESM::Class& rec) -> bool { return rec.mData.mIsPlayable; }); diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp index e2ea04e95f..ac94e29f99 100644 --- a/apps/openmw/mwlua/stats.cpp +++ b/apps/openmw/mwlua/stats.cpp @@ -447,7 +447,7 @@ namespace MWLua skillT["description"] = sol::readonly_property([](const ESM::Skill& rec) -> std::string_view { return rec.mDescription; }); skillT["specialization"] = sol::readonly_property([](const ESM::Skill& rec) -> std::string_view { - return ESM::Class::indexToLuaId.at(rec.mData.mSpecialization); + return ESM::Class::specilizationIndexToLuaId.at(rec.mData.mSpecialization); }); skillT["icon"] = sol::readonly_property([vfs](const ESM::Skill& rec) -> std::string { return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs); diff --git a/components/esm3/loadclas.cpp b/components/esm3/loadclas.cpp index dcfeb958c1..01bf6f54f6 100644 --- a/components/esm3/loadclas.cpp +++ b/components/esm3/loadclas.cpp @@ -10,7 +10,7 @@ namespace ESM { const std::string_view Class::sGmstSpecializationIds[3] = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" }; - const std::array Class::indexToLuaId = { "combat", "magic", "stealth" }; + const std::array Class::specilizationIndexToLuaId = { "combat", "magic", "stealth" }; int32_t& Class::CLDTstruct::getSkill(int index, bool major) { diff --git a/components/esm3/loadclas.hpp b/components/esm3/loadclas.hpp index 00bdbb9845..2070f2127a 100644 --- a/components/esm3/loadclas.hpp +++ b/components/esm3/loadclas.hpp @@ -30,9 +30,9 @@ namespace ESM Magic = 1, Stealth = 2 }; - + static const std::string_view sGmstSpecializationIds[3]; - static const std::array indexToLuaId; + static const std::array specilizationIndexToLuaId; struct CLDTstruct {