mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 09:39:53 +00:00
Code Issues Projects Releases Wiki Activity

Use arrays in CreateClassDialog

Browse Source
This commit is contained in:
Jan-Peter Nilsson 2010-11-05 19:40:31 +01:00
parent 528c39f1bd
commit e5509ce7b1
2 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
apps/openmw/mwgui/class.cpp
View File

@ -430,28 +430,15 @@ CreateClassDialog::CreateClassDialog(MWWorld::Environment& environment)
favoriteAttribute1->eventClicked = MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked); favoriteAttribute1->eventClicked = MyGUI::newDelegate(this, &CreateClassDialog::onAttributeClicked);
setText("MajorSkillT", wm->getGameSettingString("sSkillClassMajor", "")); setText("MajorSkillT", wm->getGameSettingString("sSkillClassMajor", ""));
getWidget(majorSkill0, "MajorSkill0");
getWidget(majorSkill1, "MajorSkill1");
getWidget(majorSkill2, "MajorSkill2");
getWidget(majorSkill3, "MajorSkill3");
getWidget(majorSkill4, "MajorSkill4");
skills.push_back(majorSkill0);
skills.push_back(majorSkill1);
skills.push_back(majorSkill2);
skills.push_back(majorSkill3);
skills.push_back(majorSkill4);
setText("MinorSkillT", wm->getGameSettingString("sSkillClassMinor", "")); setText("MinorSkillT", wm->getGameSettingString("sSkillClassMinor", ""));
getWidget(minorSkill0, "MinorSkill0"); for(int i = 0; i < 5; i++)
getWidget(minorSkill1, "MinorSkill1"); {
getWidget(minorSkill2, "MinorSkill2"); char theIndex = '0'+i;
getWidget(minorSkill3, "MinorSkill3"); getWidget(majorSkill[i], std::string("MajorSkill").append(1, theIndex));
getWidget(minorSkill4, "MinorSkill4"); getWidget(minorSkill[i], std::string("MinorSkill").append(1, theIndex));
skills.push_back(minorSkill0); skills.push_back(majorSkill[i]);
skills.push_back(minorSkill1); skills.push_back(minorSkill[i]);
skills.push_back(minorSkill2); }
skills.push_back(minorSkill3);
skills.push_back(minorSkill4);
std::vector<Widgets::MWSkillPtr>::const_iterator end = skills.end(); std::vector<Widgets::MWSkillPtr>::const_iterator end = skills.end();
for (std::vector<Widgets::MWSkillPtr>::const_iterator it = skills.begin(); it != end; ++it) for (std::vector<Widgets::MWSkillPtr>::const_iterator it = skills.begin(); it != end; ++it)
@ -484,17 +471,17 @@ CreateClassDialog::CreateClassDialog(MWWorld::Environment& environment)
favoriteAttribute0->setAttributeId(ESM::Attribute::Strength); favoriteAttribute0->setAttributeId(ESM::Attribute::Strength);
favoriteAttribute1->setAttributeId(ESM::Attribute::Agility); favoriteAttribute1->setAttributeId(ESM::Attribute::Agility);
majorSkill0->setSkillId(ESM::Skill::Block); majorSkill[0]->setSkillId(ESM::Skill::Block);
majorSkill1->setSkillId(ESM::Skill::Armorer); majorSkill[1]->setSkillId(ESM::Skill::Armorer);
majorSkill2->setSkillId(ESM::Skill::MediumArmor); majorSkill[2]->setSkillId(ESM::Skill::MediumArmor);
majorSkill3->setSkillId(ESM::Skill::HeavyArmor); majorSkill[3]->setSkillId(ESM::Skill::HeavyArmor);
majorSkill4->setSkillId(ESM::Skill::BluntWeapon); majorSkill[4]->setSkillId(ESM::Skill::BluntWeapon);
minorSkill0->setSkillId(ESM::Skill::LongBlade); minorSkill[0]->setSkillId(ESM::Skill::LongBlade);
minorSkill1->setSkillId(ESM::Skill::Axe); minorSkill[1]->setSkillId(ESM::Skill::Axe);
minorSkill2->setSkillId(ESM::Skill::Spear); minorSkill[2]->setSkillId(ESM::Skill::Spear);
minorSkill3->setSkillId(ESM::Skill::Athletics); minorSkill[3]->setSkillId(ESM::Skill::Athletics);
minorSkill4->setSkillId(ESM::Skill::Enchant); minorSkill[4]->setSkillId(ESM::Skill::Enchant);
} }
CreateClassDialog::~CreateClassDialog() CreateClassDialog::~CreateClassDialog()
@ -531,22 +518,20 @@ std::vector<int> CreateClassDialog::getFavoriteAttributes() const
std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMajorSkills() const std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMajorSkills() const
{ {
std::vector<ESM::Skill::SkillEnum> v; std::vector<ESM::Skill::SkillEnum> v;
v.push_back(majorSkill0->getSkillId()); for(int i = 0; i < 5; i++)
v.push_back(majorSkill1->getSkillId()); {
v.push_back(majorSkill2->getSkillId()); v.push_back(majorSkill[i]->getSkillId());
v.push_back(majorSkill3->getSkillId()); }
v.push_back(majorSkill4->getSkillId());
return v; return v;
} }
std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMinorSkills() const std::vector<ESM::Skill::SkillEnum> CreateClassDialog::getMinorSkills() const
{ {
std::vector<ESM::Skill::SkillEnum> v; std::vector<ESM::Skill::SkillEnum> v;
v.push_back(majorSkill0->getSkillId()); for(int i=0; i < 5; i++)
v.push_back(majorSkill1->getSkillId()); {
v.push_back(majorSkill2->getSkillId()); v.push_back(majorSkill[i]->getSkillId());
v.push_back(majorSkill3->getSkillId()); }
v.push_back(majorSkill4->getSkillId());
return v; return v;
} }

4
apps/openmw/mwgui/class.hpp
View File

@ -328,8 +328,8 @@ namespace MWGui
MyGUI::EditPtr editName; MyGUI::EditPtr editName;
MyGUI::WidgetPtr specializationName; MyGUI::WidgetPtr specializationName;
Widgets::MWAttributePtr favoriteAttribute0, favoriteAttribute1; Widgets::MWAttributePtr favoriteAttribute0, favoriteAttribute1;
Widgets::MWSkillPtr majorSkill0, majorSkill1, majorSkill2, majorSkill3, majorSkill4; Widgets::MWSkillPtr majorSkill[5];
Widgets::MWSkillPtr minorSkill0, minorSkill1, minorSkill2, minorSkill3, minorSkill4; Widgets::MWSkillPtr minorSkill[5];
std::vector<Widgets::MWSkillPtr> skills; std::vector<Widgets::MWSkillPtr> skills;
std::string description; std::string description;