From c07b3ea61d96b918be9df6cdd23df9691e52ee77 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 17 Mar 2013 04:20:30 +0100
Subject: [PATCH] Text defines for npc race, class, and faction should use the
 translated name

---
 apps/openmw/mwscript/interpretercontext.cpp | 9 ++++++---
 apps/openmw/mwscript/interpretercontext.hpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index c74e3f163..cad143c46 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -215,19 +215,22 @@ namespace MWScript
     std::string InterpreterContext::getNPCRace() const
     {
         ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
-        return npc.mRace;
+        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(npc.mRace);
+        return race->mName;
     }
 
     std::string InterpreterContext::getNPCClass() const
     {
         ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
-        return npc.mClass;
+        const ESM::Class* class_ = MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(npc.mClass);
+        return class_->mName;
     }
 
     std::string InterpreterContext::getNPCFaction() const
     {
         ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
-        return npc.mFaction;
+        const ESM::Faction* faction = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(npc.mFaction);
+        return faction->mName;
     }
 
     std::string InterpreterContext::getNPCRank() const
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index f0b2758d9..9c7b443ae 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -89,7 +89,7 @@ namespace MWScript
             virtual std::string getNPCClass() const;
             
             virtual std::string getNPCFaction() const;
-            
+
             virtual std::string getNPCRank() const;
             
             virtual std::string getPCName() const;