From e68b388d161030ca1122bbebd4772017701b8dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kune=C5=A1?= <jirka642@gmail.com>
Date: Fri, 17 Jul 2015 19:13:45 +0200
Subject: [PATCH] removed setCrosshairOwned from windowmanager

---
 apps/openmw/mwbase/windowmanager.hpp   |  1 -
 apps/openmw/mwgui/tooltips.cpp         | 32 +++++++++++---------------
 apps/openmw/mwgui/tooltips.hpp         |  6 ++---
 apps/openmw/mwgui/windowmanagerimp.cpp | 12 +++++-----
 apps/openmw/mwgui/windowmanagerimp.hpp |  1 -
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 86b42c9f97..f8bf157c2d 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -219,7 +219,6 @@ namespace MWBase
             virtual void unsetSelectedWeapon() = 0;
 
             virtual void showCrosshair(bool show) = 0;
-            virtual void setCrosshairOwned(bool owned) = 0;
             virtual bool getSubtitlesEnabled() = 0;
             virtual bool toggleGui() = 0;
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 40df4a4b45..28ff472602 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -300,8 +300,6 @@ namespace MWGui
                 mDynamicToolTipBox->setVisible(true);
                 
             }
-            
-            checkOwned();
         }
     }
 
@@ -351,27 +349,23 @@ namespace MWGui
         return tooltipSize;
     }
     
-    void ToolTips::checkOwned()
+    bool ToolTips::checkOwned()
     {
-        if(Settings::Manager::getBool("show owned", "Game"))
+        // true=owned, false=notOwned
+        if(!mFocusObject.isEmpty())
         {
-            MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
+            MWWorld::CellRef& cellref = mFocusObject.getCellRef();
+            MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            MWWorld::Ptr victim;
             
-            if(!mFocusObject.isEmpty())
-            {
-                MWWorld::CellRef& cellref = mFocusObject.getCellRef();
-                MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                MWWorld::Ptr victim;
-                
-                MWBase::MechanicsManager* mm = MWBase::Environment::get().getMechanicsManager();
-                bool allowed = mm->isAllowedToUse(ptr, cellref, victim); // 0 - owned, 1 - not owned
+            MWBase::MechanicsManager* mm = MWBase::Environment::get().getMechanicsManager();
+            bool allowed = mm->isAllowedToUse(ptr, cellref, victim); 
 
-                wm->setCrosshairOwned(!allowed);
-            }
-            else
-            {
-                wm->setCrosshairOwned(false);
-            }
+            return !allowed;
+        }
+        else
+        {
+            return false;
         }
     }
 
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index a54888780d..26a4fe2c75 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -87,6 +87,9 @@ namespace MWGui
         static void createRaceToolTip(MyGUI::Widget* widget, const ESM::Race* playerRace);
         static void createClassToolTip(MyGUI::Widget* widget, const ESM::Class& playerClass);
         static void createMagicEffectToolTip(MyGUI::Widget* widget, short id);
+        
+        bool checkOwned();
+        /// Checks if object is owned and sets correct crosshair mode 
 
     private:
         MyGUI::Widget* mDynamicToolTipBox;
@@ -95,9 +98,6 @@ namespace MWGui
 
         MyGUI::IntSize getToolTipViaPtr (bool image=true);
         ///< @return requested tooltip size
-        
-        void checkOwned();
-        /// Checks if object is owned and sets correct crosshair mode 
 
         MyGUI::IntSize createToolTip(const ToolTipInfo& info);
         ///< @return requested tooltip size
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 2588f2d86b..2f8cfbf627 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1038,6 +1038,12 @@ namespace MWGui
     void WindowManager::setFocusObject(const MWWorld::Ptr& focus)
     {
         mToolTips->setFocusObject(focus);
+        
+        if(Settings::Manager::getBool("show owned", "Game") && mHud)
+        {
+            bool owned = mToolTips->checkOwned();
+            mHud->setCrosshairOwned(owned);  
+        }
     }
 
     void WindowManager::setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y)
@@ -1423,12 +1429,6 @@ namespace MWGui
         if (mHud)
             mHud->setCrosshairVisible (show && mCrosshairEnabled);
     }
-    
-    void WindowManager::setCrosshairOwned (bool owned)
-    {
-        if (mHud)
-            mHud->setCrosshairOwned (owned);
-    }
 
     void WindowManager::activateQuickKey (int index)
     {
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 94538840bf..e6c8d0a817 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -233,7 +233,6 @@ namespace MWGui
     virtual void unsetSelectedWeapon();
 
     virtual void showCrosshair(bool show);
-    virtual void setCrosshairOwned(bool owned);
     virtual bool getSubtitlesEnabled();
 
     /// Turn visibility of *all* GUI elements on or off (HUD and all windows, except the console)