Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 12:58:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Deduplicate specialization code

Browse source
This commit is contained in:
Evil Eye 2023-05-26 12:16:47 +02:00
parent 2ab5b8e7b0
commit 877f6747be
5 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/class.cpp
View file

@ -254,10 +254,8 @@ namespace MWGui
ESM::Class::Specialization specialization ESM::Class::Specialization specialization
= static_cast<ESM::Class::Specialization>(klass->mData.mSpecialization); = static_cast<ESM::Class::Specialization>(klass->mData.mSpecialization);
static const std::string_view specIds[3]
= { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString( std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
specIds[specialization], specIds[specialization]) }; ESM::Class::sGmstSpecializationIds[specialization], ESM::Class::sGmstSpecializationIds[specialization]) };
mSpecializationName->setCaption(specName); mSpecializationName->setCaption(specName);
ToolTips::createSpecializationToolTip(mSpecializationName, specName, specialization); ToolTips::createSpecializationToolTip(mSpecializationName, specName, specialization);
@ -579,11 +577,10 @@ namespace MWGui
void CreateClassDialog::setSpecialization(int id) void CreateClassDialog::setSpecialization(int id)
{ {
mSpecializationId = (ESM::Class::Specialization)id; mSpecializationId = ESM::Class::Specialization(id);
static const std::string_view specIds[3]
= { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString( std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
specIds[mSpecializationId], specIds[mSpecializationId]) }; ESM::Class::sGmstSpecializationIds[mSpecializationId],
ESM::Class::sGmstSpecializationIds[mSpecializationId]) };
mSpecializationName->setCaption(specName); mSpecializationName->setCaption(specName);
ToolTips::createSpecializationToolTip(mSpecializationName, specName, mSpecializationId); ToolTips::createSpecializationToolTip(mSpecializationName, specName, mSpecializationId);
} }

10
apps/openmw/mwgui/tooltips.cpp
View file

@ -936,13 +936,9 @@ namespace MWGui
return; return;
int spec = playerClass.mData.mSpecialization; int spec = playerClass.mData.mSpecialization;
std::string specStr; std::string specStr = "#{";
if (spec == 0) specStr += ESM::Class::sGmstSpecializationIds[spec];
specStr = "#{sSpecializationCombat}"; specStr += '}';
else if (spec == 1)
specStr = "#{sSpecializationMagic}";
else if (spec == 2)
specStr = "#{sSpecializationStealth}";
widget->setUserString("Caption_ClassName", playerClass.mName); widget->setUserString("Caption_ClassName", playerClass.mName);
widget->setUserString("Caption_ClassDescription", playerClass.mDescription); widget->setUserString("Caption_ClassDescription", playerClass.mDescription);

7
components/esm/defs.hpp
View file

@ -32,13 +32,6 @@ namespace ESM
// Pixel color value. Standard four-byte rr,gg,bb,aa format. // Pixel color value. Standard four-byte rr,gg,bb,aa format.
typedef uint32_t Color; typedef uint32_t Color;
enum Specialization
{
SPC_Combat = 0,
SPC_Magic = 1,
SPC_Stealth = 2
};
enum RangeType enum RangeType
{ {
RT_Self = 0, RT_Self = 0,

4
components/esm3/loadclas.cpp
View file

@ -8,9 +8,7 @@
namespace ESM namespace ESM
{ {
const Class::Specialization Class::sSpecializationIds[3] = { Class::Combat, Class::Magic, Class::Stealth }; const std::string_view Class::sGmstSpecializationIds[3]
const char* Class::sGmstSpecializationIds[3]
= { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" }; = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
int& Class::CLDTstruct::getSkill(int index, bool major) int& Class::CLDTstruct::getSkill(int index, bool major)

3
components/esm3/loadclas.hpp
View file

@ -29,8 +29,7 @@ namespace ESM
Stealth = 2 Stealth = 2
}; };
static const Specialization sSpecializationIds[3]; static const std::string_view sGmstSpecializationIds[3];
static const char* sGmstSpecializationIds[3];
struct CLDTstruct struct CLDTstruct
{ {