mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 01:45:34 +00:00
Code Issues Releases Wiki Activity

post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)

Browse source
This commit is contained in:
Marc Zinnschlag 2013-01-03 09:55:48 +01:00
parent c0260697c2
commit 25d9918765
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwscript/interpretercontext.cpp
View file

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