From eca18f3e1d5d73c44ee0e05f39ce0d733524c927 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 29 Apr 2012 18:13:03 +0200
Subject: [PATCH] dialogue topic and choice sorting independent of case

---
 apps/openmw/mwdialogue/dialoguemanager.cpp | 20 +++++++++++++++++++-
 apps/openmw/mwgui/dialogue.cpp             |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanager.cpp b/apps/openmw/mwdialogue/dialoguemanager.cpp
index 24ee4ee7f..ac41244d1 100644
--- a/apps/openmw/mwdialogue/dialoguemanager.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.cpp
@@ -54,6 +54,20 @@ namespace
         return lowerCase;
     }
 
+    bool stringCompareNoCase (std::string first, std::string second)
+    {
+        unsigned int i=0;
+        while ( (i<first.length()) && (i<second.length()) )
+        {
+            if (tolower(first[i])<tolower(second[i])) return true;
+            else if (tolower(first[i])>tolower(second[i])) return false;
+            ++i;
+        }
+        if (first.length()<second.length())
+            return true;
+        else
+            return false;
+    }
 
     template<typename T1, typename T2>
     bool selectCompare (char comp, T1 value1, T2 value2)
@@ -723,7 +737,11 @@ namespace MWDialogue
                 }
             }
         }
+
+        // sort again, because the previous sort was case-sensitive
+        keywordList.sort(stringCompareNoCase);
         win->setKeywords(keywordList);
+
         mChoice = choice;
     }
 
@@ -815,7 +833,7 @@ namespace MWDialogue
     {
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
         win->askQuestion(question);
-        mChoiceMap[question] = choice;
+        mChoiceMap[toLower(question)] = choice;
         mIsInChoice = true;
     }
 
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 2386cf9a3..960ead2ac 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -84,7 +84,7 @@ void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
         UString key = history->getColorTextAt(cursorPosition);
         if(color == "#686EBA") MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(key));
 
-        if(color == "#572D21") MWBase::Environment::get().getDialogueManager()->questionAnswered(key);
+        if(color == "#572D21") MWBase::Environment::get().getDialogueManager()->questionAnswered(lower_string(key));
     }
 }