teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Use arrays in SelectSkillDialog

Browse source
This commit is contained in:
Jan-Peter Nilsson 2010-11-05 18:51:42 +01:00
parent d7b76809ac
commit ef54401407
2 changed files with 37 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -851,69 +851,47 @@ SelectSkillDialog::SelectSkillDialog(MWWorld::Environment& environment, MyGUI::I
setText("MagicLabelT", wm->getGameSettingString("sSpecializationMagic", "")); setText("MagicLabelT", wm->getGameSettingString("sSpecializationMagic", ""));
setText("StealthLabelT", wm->getGameSettingString("sSpecializationStealth", "")); setText("StealthLabelT", wm->getGameSettingString("sSpecializationStealth", ""));
getWidget(combatSkill0, "CombatSkill0"); for(int i = 0; i < 9; i++)
getWidget(combatSkill1, "CombatSkill1"); {
getWidget(combatSkill2, "CombatSkill2"); char theIndex = '0'+i;
getWidget(combatSkill3, "CombatSkill3"); getWidget(combatSkill[i], std::string("CombatSkill").append(1, theIndex));
getWidget(combatSkill4, "CombatSkill4"); getWidget(magicSkill[i], std::string("MagicSkill").append(1, theIndex));
getWidget(combatSkill5, "CombatSkill5"); getWidget(stealthSkill[i], std::string("StealthSkill").append(1, theIndex));
getWidget(combatSkill6, "CombatSkill6"); }
getWidget(combatSkill7, "CombatSkill7");
getWidget(combatSkill8, "CombatSkill8");
getWidget(magicSkill0, "MagicSkill0");
getWidget(magicSkill1, "MagicSkill1");
getWidget(magicSkill2, "MagicSkill2");
getWidget(magicSkill3, "MagicSkill3");
getWidget(magicSkill4, "MagicSkill4");
getWidget(magicSkill5, "MagicSkill5");
getWidget(magicSkill6, "MagicSkill6");
getWidget(magicSkill7, "MagicSkill7");
getWidget(magicSkill8, "MagicSkill8");
getWidget(stealthSkill0, "StealthSkill0");
getWidget(stealthSkill1, "StealthSkill1");
getWidget(stealthSkill2, "StealthSkill2");
getWidget(stealthSkill3, "StealthSkill3");
getWidget(stealthSkill4, "StealthSkill4");
getWidget(stealthSkill5, "StealthSkill5");
getWidget(stealthSkill6, "StealthSkill6");
getWidget(stealthSkill7, "StealthSkill7");
getWidget(stealthSkill8, "StealthSkill8");
struct {Widgets::MWSkillPtr widget; ESM::Skill::SkillEnum skillId;} skills[3][9] = { struct {Widgets::MWSkillPtr widget; ESM::Skill::SkillEnum skillId;} skills[3][9] = {
{ {
{combatSkill0, ESM::Skill::Block}, {combatSkill[0], ESM::Skill::Block},
{combatSkill1, ESM::Skill::Armorer}, {combatSkill[1], ESM::Skill::Armorer},
{combatSkill2, ESM::Skill::MediumArmor}, {combatSkill[2], ESM::Skill::MediumArmor},
{combatSkill3, ESM::Skill::HeavyArmor}, {combatSkill[3], ESM::Skill::HeavyArmor},
{combatSkill4, ESM::Skill::BluntWeapon}, {combatSkill[4], ESM::Skill::BluntWeapon},
{combatSkill5, ESM::Skill::LongBlade}, {combatSkill[5], ESM::Skill::LongBlade},
{combatSkill6, ESM::Skill::Axe}, {combatSkill[6], ESM::Skill::Axe},
{combatSkill7, ESM::Skill::Spear}, {combatSkill[7], ESM::Skill::Spear},
{combatSkill8, ESM::Skill::Athletics} {combatSkill[8], ESM::Skill::Athletics}
}, },
{ {
{magicSkill0, ESM::Skill::Enchant}, {magicSkill[0], ESM::Skill::Enchant},
{magicSkill1, ESM::Skill::Destruction}, {magicSkill[1], ESM::Skill::Destruction},
{magicSkill2, ESM::Skill::Alteration}, {magicSkill[2], ESM::Skill::Alteration},
{magicSkill3, ESM::Skill::Illusion}, {magicSkill[3], ESM::Skill::Illusion},
{magicSkill4, ESM::Skill::Conjuration}, {magicSkill[4], ESM::Skill::Conjuration},
{magicSkill5, ESM::Skill::Mysticism}, {magicSkill[5], ESM::Skill::Mysticism},
{magicSkill6, ESM::Skill::Restoration}, {magicSkill[6], ESM::Skill::Restoration},
{magicSkill7, ESM::Skill::Alchemy}, {magicSkill[7], ESM::Skill::Alchemy},
{magicSkill8, ESM::Skill::Unarmored} {magicSkill[8], ESM::Skill::Unarmored}
}, },
{ {
{stealthSkill0, ESM::Skill::Security}, {stealthSkill[0], ESM::Skill::Security},
{stealthSkill1, ESM::Skill::Sneak}, {stealthSkill[1], ESM::Skill::Sneak},
{stealthSkill2, ESM::Skill::Acrobatics}, {stealthSkill[2], ESM::Skill::Acrobatics},
{stealthSkill3, ESM::Skill::LightArmor}, {stealthSkill[3], ESM::Skill::LightArmor},
{stealthSkill4, ESM::Skill::ShortBlade}, {stealthSkill[4], ESM::Skill::ShortBlade},
{stealthSkill5 ,ESM::Skill::Marksman}, {stealthSkill[5] ,ESM::Skill::Marksman},
{stealthSkill6 ,ESM::Skill::Mercantile}, {stealthSkill[6] ,ESM::Skill::Mercantile},
{stealthSkill7 ,ESM::Skill::Speechcraft}, {stealthSkill[7] ,ESM::Skill::Speechcraft},
{stealthSkill8 ,ESM::Skill::HandToHand} {stealthSkill[8] ,ESM::Skill::HandToHand}
} }
}; };

9
apps/openmw/mwgui/class.hpp
View file

@ -246,12 +246,9 @@ namespace MWGui
void onCancelClicked(MyGUI::Widget* _sender); void onCancelClicked(MyGUI::Widget* _sender);
private: private:
Widgets::MWSkillPtr combatSkill0, combatSkill1, combatSkill2, combatSkill3, combatSkill4, Widgets::MWSkillPtr combatSkill[9];
combatSkill5, combatSkill6, combatSkill7, combatSkill8; Widgets::MWSkillPtr magicSkill[9];
Widgets::MWSkillPtr magicSkill0, magicSkill1, magicSkill2, magicSkill3, magicSkill4, Widgets::MWSkillPtr stealthSkill[9];
magicSkill5, magicSkill6, magicSkill7, magicSkill8;
Widgets::MWSkillPtr stealthSkill0, stealthSkill1, stealthSkill2, stealthSkill3, stealthSkill4,
stealthSkill5, stealthSkill6, stealthSkill7, stealthSkill8;
Widgets::MWSkillPtr affectedWidget; Widgets::MWSkillPtr affectedWidget;
ESM::Skill::SkillEnum skillId; ESM::Skill::SkillEnum skillId;