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

Use arrays in PickClassDialog

Browse source
This commit is contained in:
Jan-Peter Nilsson 2010-11-05 19:40:00 +01:00
parent ef54401407
commit 528c39f1bd
2 changed files with 19 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,34 +89,21 @@ PickClassDialog::PickClassDialog(MWWorld::Environment& environment)
getWidget(specializationName, "SpecializationName"); getWidget(specializationName, "SpecializationName");
setText("FavoriteAttributesT", wm->getGameSettingString("sChooseClassMenu2", "Favorite Attributes:")); setText("FavoriteAttributesT", wm->getGameSettingString("sChooseClassMenu2", "Favorite Attributes:"));
getWidget(favoriteAttribute0, "FavoriteAttribute0"); getWidget(favoriteAttribute[0], "FavoriteAttribute0");
getWidget(favoriteAttribute1, "FavoriteAttribute1"); getWidget(favoriteAttribute[1], "FavoriteAttribute1");
favoriteAttribute0->setWindowManager(wm); favoriteAttribute[0]->setWindowManager(wm);
favoriteAttribute1->setWindowManager(wm); favoriteAttribute[1]->setWindowManager(wm);
setText("MajorSkillT", wm->getGameSettingString("sChooseClassMenu3", "Major Skills:")); setText("MajorSkillT", wm->getGameSettingString("sChooseClassMenu3", "Major Skills:"));
getWidget(majorSkill0, "MajorSkill0");
getWidget(majorSkill1, "MajorSkill1");
getWidget(majorSkill2, "MajorSkill2");
getWidget(majorSkill3, "MajorSkill3");
getWidget(majorSkill4, "MajorSkill4");
majorSkill0->setWindowManager(wm);
majorSkill1->setWindowManager(wm);
majorSkill2->setWindowManager(wm);
majorSkill3->setWindowManager(wm);
majorSkill4->setWindowManager(wm);
setText("MinorSkillT", wm->getGameSettingString("sChooseClassMenu4", "Minor Skills:")); setText("MinorSkillT", wm->getGameSettingString("sChooseClassMenu4", "Minor Skills:"));
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));
minorSkill0->setWindowManager(wm); majorSkill[i]->setWindowManager(wm);
minorSkill1->setWindowManager(wm); minorSkill[i]->setWindowManager(wm);
minorSkill2->setWindowManager(wm); }
minorSkill3->setWindowManager(wm);
minorSkill4->setWindowManager(wm);
getWidget(classList, "ClassList"); getWidget(classList, "ClassList");
classList->setScrollVisible(true); classList->setScrollVisible(true);
@ -259,28 +246,13 @@ void PickClassDialog::updateStats()
}; };
specializationName->setCaption(wm->getGameSettingString(specIds[specialization], specIds[specialization])); specializationName->setCaption(wm->getGameSettingString(specIds[specialization], specIds[specialization]));
favoriteAttribute0->setAttributeId(klass->data.attribute[0]); favoriteAttribute[0]->setAttributeId(klass->data.attribute[0]);
favoriteAttribute1->setAttributeId(klass->data.attribute[1]); favoriteAttribute[1]->setAttributeId(klass->data.attribute[1]);
Widgets::MWSkillPtr majorSkills[5] = {
majorSkill0,
majorSkill1,
majorSkill2,
majorSkill3,
majorSkill4
};
Widgets::MWSkillPtr minorSkills[5] = {
minorSkill0,
minorSkill1,
minorSkill2,
minorSkill3,
minorSkill4
};
for (int i = 0; i < 5; ++i) for (int i = 0; i < 5; ++i)
{ {
majorSkills[i]->setSkillNumber(klass->data.skills[i][0]); majorSkill[i]->setSkillNumber(klass->data.skills[i][0]);
minorSkills[i]->setSkillNumber(klass->data.skills[i][1]); minorSkill[i]->setSkillNumber(klass->data.skills[i][1]);
} }
classImage->setImageTexture(std::string("textures\\levelup\\") + currentClassId + ".dds"); classImage->setImageTexture(std::string("textures\\levelup\\") + currentClassId + ".dds");

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

@ -150,9 +150,9 @@ namespace MWGui
MyGUI::StaticImagePtr classImage; MyGUI::StaticImagePtr classImage;
MyGUI::ListPtr classList; MyGUI::ListPtr classList;
MyGUI::StaticTextPtr specializationName; MyGUI::StaticTextPtr specializationName;
Widgets::MWAttributePtr favoriteAttribute0, favoriteAttribute1; Widgets::MWAttributePtr favoriteAttribute[2];
Widgets::MWSkillPtr majorSkill0, majorSkill1, majorSkill2, majorSkill3, majorSkill4; Widgets::MWSkillPtr majorSkill[5];
Widgets::MWSkillPtr minorSkill0, minorSkill1, minorSkill2, minorSkill3, minorSkill4; Widgets::MWSkillPtr minorSkill[5];
std::string currentClassId; std::string currentClassId;
}; };