mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 19:09:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1257 from akortunov/chargen

Browse source 
Chargen menus fixes
This commit is contained in:
scrawl 2017-04-18 22:23:30 +02:00 committed by GitHub
commit f90e5081f9
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwgui/charactercreation.cpp
View file

@ -13,6 +13,7 @@
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
#include "../mwworld/player.hpp"
#include "textinput.hpp" #include "textinput.hpp"
#include "race.hpp" #include "race.hpp"
@ -230,10 +231,19 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog); MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog);
mReviewDialog = 0; mReviewDialog = 0;
mReviewDialog = new ReviewDialog(); mReviewDialog = new ReviewDialog();
mReviewDialog->setPlayerName(mPlayerName);
mReviewDialog->setRace(mPlayerRaceId); MWBase::World *world = MWBase::Environment::get().getWorld();
mReviewDialog->setClass(mPlayerClass);
mReviewDialog->setBirthSign(mPlayerBirthSignId); const ESM::NPC *playerNpc = world->getPlayerPtr().get<ESM::NPC>()->mBase;
const MWWorld::Player player = world->getPlayer();
const ESM::Class *playerClass = world->getStore().get<ESM::Class>().find(playerNpc->mClass);
mReviewDialog->setPlayerName(playerNpc->mName);
mReviewDialog->setRace(playerNpc->mRace);
mReviewDialog->setClass(*playerClass);
mReviewDialog->setBirthSign(player.getBirthSign());
{ {
MWWorld::Ptr player = MWMechanics::getPlayer(); MWWorld::Ptr player = MWMechanics::getPlayer();

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

@ -146,6 +146,7 @@ namespace MWGui
const ESM::NPC& proto = mPreview->getPrototype(); const ESM::NPC& proto = mPreview->getPrototype();
setRaceId(proto.mRace); setRaceId(proto.mRace);
setGender(proto.isMale() ? GM_Male : GM_Female);
recountParts(); recountParts();
for (unsigned int i=0; i<mAvailableHeads.size(); ++i) for (unsigned int i=0; i<mAvailableHeads.size(); ++i)