From a5b4e087c56518c6e0a75413f9c7f5cfa9f377a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kune=C5=A1?= <jirka642@gmail.com>
Date: Sat, 18 Jul 2015 22:17:46 +0200
Subject: [PATCH] define owned colours in settings.cfg

---
 apps/openmw/mwgui/windowmanagerimp.cpp | 15 +++++++++++++--
 files/mygui/openmw_hud_box.skin.xml    |  2 +-
 files/mygui/openmw_windows.skin.xml    |  3 +--
 files/settings-default.cfg             |  4 ++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 7b618efa7..0fe71632a 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1095,11 +1095,22 @@ namespace MWGui
     void WindowManager::onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result)
     {
         std::string tag(_tag);
+        
+        std::string MyGuiPrefix = "setting=";
+        size_t MyGuiPrefixLength = MyGuiPrefix.length();
 
         std::string tokenToFind = "sCell=";
         size_t tokenLength = tokenToFind.length();
-
-        if (tag.compare(0, tokenLength, tokenToFind) == 0)
+        
+        if(tag.compare(0, MyGuiPrefixLength, MyGuiPrefix) == 0)
+        {
+            tag = tag.substr(MyGuiPrefixLength, tag.length());
+            std::string settingSection = tag.substr(0, tag.find(","));
+            std::string settingTag = tag.substr(tag.find(",")+1, tag.length());
+            
+            _result = Settings::Manager::getString(settingTag, settingSection);            
+        }
+        else if (tag.compare(0, tokenLength, tokenToFind) == 0)
         {
             _result = mTranslationDataStorage.translateCellName(tag.substr(tokenLength));
         }
diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml
index dfe717c6f..33199d6ae 100644
--- a/files/mygui/openmw_hud_box.skin.xml
+++ b/files/mygui/openmw_hud_box.skin.xml
@@ -53,7 +53,7 @@
     
     <!-- Defines owned crosshair color -->
     <Resource type="ResourceSkin" name="HUD_Crosshair_Owned" size="32 32" texture="textures\target.dds">
-        <Property key="Colour" value="0.9 0 0 1"/>
+        <Property key="Colour" value="#{setting=GUI,color crosshair owned}"/>
         <BasisSkin type="MainSkin" offset="0 0 32 32">
             <State name="normal" offset="0 0 32 32"/>
         </BasisSkin>
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index c9a1f1ccc..682d89ebc 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -131,8 +131,7 @@
     
     <!-- Defines a owned background -->
     <Resource type="ResourceSkin" name="DialogBG_Owned" size="8 8" texture="white">
-        <Property key="Colour" value="0.2 0 0 1"/>
-        <!-- <Property key="Colour" value="#{setting=GUI,color background owned}"/> -->
+        <Property key="Colour" value="#{setting=GUI,color background owned}"/> 
         <BasisSkin type="MainSkin" offset="0 0 8 8">
             <State name="normal" offset="0 0 8 8"/>
         </BasisSkin>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index d84291a24..dcb9b8893 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -36,6 +36,10 @@ werewolf overlay = true
 
 stretch menu background = false
 
+# colour definitions (red green blue alpha)
+color background owned = 0.15 0 0 1
+color crosshair owned = 1 0.15 0.15 1
+
 [General]
 # Camera field of view
 field of view = 55