1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-05 18:49:40 +00:00

Merge remote-tracking branch 'scrawl/master'

This commit is contained in:
Marc Zinnschlag 2013-01-03 09:52:46 +01:00
commit c0260697c2

View file

@ -252,15 +252,17 @@ namespace MWScript
std::string InterpreterContext::getPCRace() const std::string InterpreterContext::getPCRace() const
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
ESM::NPC player = *world->getPlayer().getPlayer().get<ESM::NPC>()->mBase; std::string race = world->getPlayer().getPlayer().get<ESM::NPC>()->mBase->mRace;
return player.mRace; const ESM::Race* _race = world->getStore().get<ESM::Race>().find(race);
return _race->mName;
} }
std::string InterpreterContext::getPCClass() const std::string InterpreterContext::getPCClass() const
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
ESM::NPC player = *world->getPlayer().getPlayer().get<ESM::NPC>()->mBase; std::string _class = world->getPlayer().getPlayer().get<ESM::NPC>()->mBase->mClass;
return player.mClass; const ESM::Class* __class = world->getStore().get<ESM::Class>().find(_class);
return __class->mName;
} }
std::string InterpreterContext::getPCRank() const std::string InterpreterContext::getPCRank() const