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

Race dialog uses the ID of the race object instead of the name when referencing it.

Browse source
This commit is contained in:
Jan Borsodi 2010-09-15 13:04:57 +02:00
parent 0dafd30dfc
commit 850b8eb6a7
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwgui/race.cpp
View file

@ -92,14 +92,14 @@ RaceDialog::RaceDialog(MWWorld::Environment& environment, bool showNext)
updateSpellPowers();
}
void RaceDialog::setRace(const std::string &race)
void RaceDialog::setRaceId(const std::string &raceId)
{
currentRace = race;
currentRaceId = raceId;
raceList->setIndexSelected(MyGUI::ITEM_NONE);
size_t count = raceList->getItemCount();
for (size_t i = 0; i < count; ++i)
{
if (boost::iequals(raceList->getItem(i), race))
if (boost::iequals(raceList->getItem(i), raceId))
{
raceList->setIndexSelected(i);
break;
@ -172,11 +172,11 @@ void RaceDialog::onSelectRace(MyGUI::List* _sender, size_t _index)
if (_index == MyGUI::ITEM_NONE)
return;
const std::string race = raceList->getItem(_index);
if (boost::iequals(currentRace, race))
const std::string *raceId = raceList->getItemDataAt<std::string>(_index);
if (boost::iequals(currentRaceId, *raceId))
return;
currentRace = race;
currentRaceId = *raceId;
updateSkills();
updateSpellPowers();
}
@ -199,8 +199,8 @@ void RaceDialog::updateRaces()
if (!playable) // Only display playable races
continue;
raceList->addItem(race.name);
if (boost::iequals(race.name, currentRace))
raceList->addItem(race.name, it->first);
if (boost::iequals(race.name, currentRaceId))
raceList->setIndexSelected(index);
++index;
}
@ -214,7 +214,7 @@ void RaceDialog::updateSkills()
}
skillItems.clear();
if (currentRace.empty())
if (currentRaceId.empty())
return;
MyGUI::StaticTextPtr skillNameWidget, skillBonusWidget;
@ -223,7 +223,7 @@ void RaceDialog::updateSkills()
MyGUI::IntCoord coord2(coord1.left + coord1.width, 0, 40, 18);
ESMS::ESMStore &store = environment.mWorld->getStore();
const ESM::Race *race = store.races.find(currentRace);
const ESM::Race *race = store.races.find(currentRaceId);
int count = sizeof(race->data.bonus)/sizeof(race->data.bonus[0]); // TODO: Find a portable macro for this ARRAYSIZE?
for (int i = 0; i < count; ++i)
{
@ -257,7 +257,7 @@ void RaceDialog::updateSpellPowers()
}
spellPowerItems.clear();
if (currentRace.empty())
if (currentRaceId.empty())
return;
MyGUI::StaticTextPtr spellPowerWidget;
@ -265,7 +265,7 @@ void RaceDialog::updateSpellPowers()
MyGUI::IntCoord coord(0, 0, spellPowerList->getWidth(), 18);
ESMS::ESMStore &store = environment.mWorld->getStore();
const ESM::Race *race = store.races.find(currentRace);
const ESM::Race *race = store.races.find(currentRaceId);
std::vector<std::string>::const_iterator it = race->powers.list.begin();
std::vector<std::string>::const_iterator end = race->powers.list.end();

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

@ -34,12 +34,12 @@ namespace MWGui
GM_Female
};
const std::string &getRace() const { return currentRace; }
const std::string &getRaceId() const { return currentRaceId; }
Gender getGender() const { return genderIndex == 0 ? GM_Male : GM_Female; }
// getFace()
// getHair()
void setRace(const std::string &race);
void setRaceId(const std::string &raceId);
void setGender(Gender gender) { genderIndex = gender == GM_Male ? 0 : 1; }
// setFace()
// setHair()
@ -93,7 +93,7 @@ namespace MWGui
int genderIndex, faceIndex, hairIndex;
int faceCount, hairCount;
std::string currentRace;
std::string currentRaceId;
};
}
#endif

4
apps/openmw/mwgui/window_manager.cpp
View file

@ -201,7 +201,7 @@ void WindowManager::onRaceDialogDone()
if (raceDialog)
{
raceDialog->setVisible(false);
environment.mMechanicsManager->setPlayerRace(raceDialog->getRace(), raceDialog->getGender() == RaceDialog::GM_Male);
environment.mMechanicsManager->setPlayerRace(raceDialog->getRaceId(), raceDialog->getGender() == RaceDialog::GM_Male);
}
delete raceDialog;
raceDialog = nullptr;
@ -219,7 +219,7 @@ void WindowManager::onRaceDialogBack()
if (raceDialog)
{
raceDialog->setVisible(false);
environment.mMechanicsManager->setPlayerRace(raceDialog->getRace(), raceDialog->getGender() == RaceDialog::GM_Male);
environment.mMechanicsManager->setPlayerRace(raceDialog->getRaceId(), raceDialog->getGender() == RaceDialog::GM_Male);
}
delete raceDialog;
raceDialog = nullptr;