From ba7086cadf88ecc9aaf15908e2cbc83e7ab8080f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 3 Jan 2013 02:05:05 +0100
Subject: [PATCH] Use race/class names (instead of ID) in replaced escape
sequences
---
apps/openmw/mwscript/interpretercontext.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index cb0e4a7f9..a8d615d89 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -252,15 +252,17 @@ namespace MWScript
std::string InterpreterContext::getPCRace() const
{
MWBase::World *world = MWBase::Environment::get().getWorld();
- ESM::NPC player = *world->getPlayer().getPlayer().get<ESM::NPC>()->mBase;
- return player.mRace;
+ 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;
}
std::string InterpreterContext::getPCClass() const
{
MWBase::World *world = MWBase::Environment::get().getWorld();
- ESM::NPC player = *world->getPlayer().getPlayer().get<ESM::NPC>()->mBase;
- return player.mClass;
+ 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 InterpreterContext::getPCRank() const