From c7fab9aad6ae1d7231a589c9ed6b39dbb5d83112 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 8 Aug 2010 14:36:45 +0200
Subject: [PATCH] added test for actor race

---
 apps/openmw/mwdialogue/dialoguemanager.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanager.cpp b/apps/openmw/mwdialogue/dialoguemanager.cpp
index 3c3a60180..26f58dfd2 100644
--- a/apps/openmw/mwdialogue/dialoguemanager.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.cpp
@@ -119,7 +119,17 @@ namespace MWDialogue
             if (info.actor!=MWWorld::Class::get (actor).getId (actor))
                 return false;
 
-        // TODO check actor race
+        if (!info.race.empty())
+        {
+            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *cellRef = actor.get<ESM::NPC>();
+
+            if (!cellRef)
+                return false;
+
+            if (info.race!=cellRef->base->race)
+                return false;
+        }
+
         // TODO check actor class
         // TODO check actor faction
         // TODO check player faction
@@ -138,7 +148,6 @@ namespace MWDialogue
 
         std::cout
             << "unchecked entries:" << std::endl
-            << "    actor race: " << info.race << std::endl
             << "    actor class: " << info.clas << std::endl
             << "    actor faction: " << info.npcFaction << std::endl
             << "    player faction: " << info.pcFaction << std::endl