From 2c7c945208789b2ea29a8755608fc212721f3462 Mon Sep 17 00:00:00 2001
From: gugus <gus_512@hotmail.com>
Date: Wed, 4 Apr 2012 22:13:57 +0200
Subject: [PATCH] check playerfaction during dialogue

---
 apps/openmw/mwdialogue/dialoguemanager.cpp | 31 ++++++++++++++++++++++
 apps/openmw/mwdialogue/dialoguemanager.hpp |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/apps/openmw/mwdialogue/dialoguemanager.cpp b/apps/openmw/mwdialogue/dialoguemanager.cpp
index 1e6faf292..cd7be5031 100644
--- a/apps/openmw/mwdialogue/dialoguemanager.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.cpp
@@ -493,6 +493,21 @@ namespace MWDialogue
         }
 
         // TODO check player faction
+        if(!info.pcFaction.empty())
+        {
+            MWMechanics::NpcStats stats = MWWorld::Class::get(actor).getNpcStats(mEnvironment.mWorld->getPlayer().getPlayer());
+            std::map<std::string,int>::iterator it = stats.mFactionRank.find(info.npcFaction);
+            if(it!=stats.mFactionRank.end())
+            {
+                //check rank
+                if(it->second < info.data.rank) return false;
+            }
+            else
+            {
+                //not in the faction
+                return false;
+            }
+        }
 
         //check gender
         ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
@@ -655,6 +670,7 @@ namespace MWDialogue
 
     void DialogueManager::executeScript(std::string script)
     {
+        std::cout << script;
         std::vector<Interpreter::Type_Code> code;
         if(compile(script,code))
         {
@@ -796,4 +812,19 @@ namespace MWDialogue
         mChoiceMap[question] = choice;
         mIsInChoice = true;
     }
+
+    std::string DialogueManager::getFaction()
+    {
+        std::string factionID("");
+        MWMechanics::NpcStats stats = MWWorld::Class::get(mActor).getNpcStats(mEnvironment.mWorld->getPlayer().getPlayer());
+        if(stats.mFactionRank.empty())
+        {
+            std::cout << "No faction for this actor!";
+        }
+        else
+        {
+            factionID = stats.mFactionRank.begin()->first;
+        }
+        return factionID;
+    }
 }
diff --git a/apps/openmw/mwdialogue/dialoguemanager.hpp b/apps/openmw/mwdialogue/dialoguemanager.hpp
index 260d8e339..d0380fa71 100644
--- a/apps/openmw/mwdialogue/dialoguemanager.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.hpp
@@ -63,6 +63,9 @@ namespace MWDialogue
 
             void askQuestion(std::string question,int choice);
 
+            ///get the faction of the actor you are talking with
+            std::string getFaction();
+
             //calbacks for the GUI
             void keywordSelected(std::string keyword);
             void goodbyeSelected();