From 7ab236337b89545e129da7fe2e6439d7e274ab33 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 14 Mar 2013 21:33:00 +0100
Subject: [PATCH] Dialogue responses should be random only for persuasion
 results

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 6 +++---
 apps/openmw/mwdialogue/dialoguemanagerimp.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 35f0c9493..5258bb8a0 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -241,7 +241,7 @@ namespace MWDialogue
         }
     }
 
-    void DialogueManager::executeTopic (const std::string& topic)
+    void DialogueManager::executeTopic (const std::string& topic, bool randomResponse)
     {
         Filter filter (mActor, mChoice, mTalkedTo);
 
@@ -256,7 +256,7 @@ namespace MWDialogue
 
         if (!infos.empty())
         {
-            const ESM::DialInfo* info = infos[std::rand() % infos.size()];
+            const ESM::DialInfo* info = infos[randomResponse ? std::rand() % infos.size() : 0];
 
             parseText (info->mResponse);
 
@@ -505,7 +505,7 @@ namespace MWDialogue
             text = "Bribe";
         }
 
-        executeTopic (text + (success ? " Success" : " Fail"));
+        executeTopic (text + (success ? " Success" : " Fail"), true);
     }
 
     int DialogueManager::getTemporaryDispositionChange() const
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 1ca2ae5eb..0c0299619 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -48,7 +48,7 @@ namespace MWDialogue
 
             void printError (const std::string& error);
 
-            void executeTopic (const std::string& topic);
+            void executeTopic (const std::string& topic, bool randomResponse=false);
 
         public: