From 71d04e16da9d2d54591cdcbb620ff14043254a6d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 25 Sep 2012 21:57:57 +0200
Subject: [PATCH] fix the global map updating when pinned

---
 apps/openmw/mwgui/map_window.cpp | 12 ++++++++++++
 apps/openmw/mwgui/map_window.hpp |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/apps/openmw/mwgui/map_window.cpp b/apps/openmw/mwgui/map_window.cpp
index 0fc4233b6..8b1de6258 100644
--- a/apps/openmw/mwgui/map_window.cpp
+++ b/apps/openmw/mwgui/map_window.cpp
@@ -224,6 +224,9 @@ void LocalMapBase::setPlayerPos(const float x, const float y)
 {
     if (x == mLastPositionX && y == mLastPositionY)
         return;
+
+    notifyPlayerUpdate ();
+
     MyGUI::IntSize size = mLocalMap->getCanvasSize();
     MyGUI::IntPoint middle = MyGUI::IntPoint((1/3.f + x/3.f)*size.width,(1/3.f + y/3.f)*size.height);
     MyGUI::IntCoord viewsize = mLocalMap->getCoord();
@@ -239,6 +242,9 @@ void LocalMapBase::setPlayerDir(const float x, const float y)
 {
     if (x == mLastDirectionX && y == mLastDirectionY)
         return;
+
+    notifyPlayerUpdate ();
+
     MyGUI::ISubWidget* main = mCompass->getSubWidgetMain();
     MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
     rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
@@ -407,3 +413,9 @@ void MapWindow::globalMapUpdatePlayer ()
     MyGUI::IntPoint viewoffs(0.5*viewsize.width - worldX, 0.5*viewsize.height - worldY);
     mGlobalMap->setViewOffset(viewoffs);
 }
+
+void MapWindow::notifyPlayerUpdate ()
+{
+    if (mGlobal)
+        globalMapUpdatePlayer ();
+}
diff --git a/apps/openmw/mwgui/map_window.hpp b/apps/openmw/mwgui/map_window.hpp
index 042e6c8ec..73eaad1cd 100644
--- a/apps/openmw/mwgui/map_window.hpp
+++ b/apps/openmw/mwgui/map_window.hpp
@@ -49,6 +49,8 @@ namespace MWGui
         void onMarkerFocused(MyGUI::Widget* w1, MyGUI::Widget* w2);
         void onMarkerUnfocused(MyGUI::Widget* w1, MyGUI::Widget* w2);
 
+        virtual void notifyPlayerUpdate() {}
+
         OEngine::GUI::Layout* mLayout;
 
         bool mMapDragAndDrop;
@@ -93,6 +95,8 @@ namespace MWGui
 
     protected:
         virtual void onPinToggled();
+
+        virtual void notifyPlayerUpdate();
     };
 }
 #endif