Closes #566: In interior cells, update global map position marker using the first exterior teleport door

apps/openmw/mwbase/world.hpp

@@ -430,6 +430,8 @@ namespace MWBase
 
             // Are we in an exterior or pseudo-exterior cell and it's night?
             virtual bool isDark() const = 0;
+
+            virtual bool findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, Ogre::Vector3& result) = 0;
     };
 }
 

apps/openmw/mwgui/mapwindow.cpp

@@ -395,6 +395,9 @@ namespace MWGui
     }
 
     void MapWindow::globalMapUpdatePlayer ()
+    {
+        // For interiors, position is set by WindowManager via setGlobalMapPlayerPosition
+        if (MWBase::Environment::get().getWorld ()->isCellExterior ())
         {
             Ogre::Vector3 pos = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer().getRefData ().getBaseNode ()->_getDerivedPosition ();
             Ogre::Quaternion orient = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer().getRefData ().getBaseNode ()->_getDerivedOrientation ();
@@ -405,11 +408,6 @@ namespace MWGui
             worldX *= mGlobalMapRender->getWidth();
             worldY *= mGlobalMapRender->getHeight();
 
-
-        // for interiors, we have no choice other than using the last position & direction.
-        /// \todo save this last position in the savegame?
-        if (MWBase::Environment::get().getWorld ()->isCellExterior ())
-        {
             mPlayerArrowGlobal->setPosition(MyGUI::IntPoint(worldX - 16, worldY - 16));
 
             MyGUI::ISubWidget* main = mPlayerArrowGlobal->getSubWidgetMain();
@@ -444,4 +442,19 @@ namespace MWGui
                 "#{sWorld}");
     }
 
+    void MapWindow::setGlobalMapPlayerPosition(float worldX, float worldY)
+    {
+        float x, y;
+        mGlobalMapRender->worldPosToImageSpace (worldX, worldY, x, y);
+        x *= mGlobalMapRender->getWidth();
+        y *= mGlobalMapRender->getHeight();
+
+        mPlayerArrowGlobal->setPosition(MyGUI::IntPoint(x - 16, y - 16));
+
+        // set the view offset so that player is in the center
+        MyGUI::IntSize viewsize = mGlobalMap->getSize();
+        MyGUI::IntPoint viewoffs(0.5*viewsize.width - x, 0.5*viewsize.height - y);
+        mGlobalMap->setViewOffset(viewoffs);
+    }
+
 }

apps/openmw/mwgui/mapwindow.hpp

@@ -81,6 +81,8 @@ namespace MWGui
         void addVisitedLocation(const std::string& name, int x, int y); // adds the marker to the global map
         void cellExplored(int x, int y);
 
+        void setGlobalMapPlayerPosition (float worldX, float worldY);
+
         virtual void open();
 
     private:

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -774,6 +774,11 @@ namespace MWGui
             mHud->setCellName( cell->mCell->mName );
             mMap->setCellPrefix( cell->mCell->mName );
             mHud->setCellPrefix( cell->mCell->mName );
+
+            Ogre::Vector3 worldPos;
+            if (MWBase::Environment::get().getWorld()->findInteriorPositionInWorldSpace(cell, worldPos))
+                mMap->setGlobalMapPlayerPosition(worldPos.x, worldPos.y);
+
         }
 
     }

apps/openmw/mwworld/worldimp.cpp

@@ -2290,4 +2290,25 @@ namespace MWWorld
     {
         return mWeatherManager->isDark();
     }
+
+    bool World::findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, Ogre::Vector3& result)
+    {
+        MWWorld::CellRefList<ESM::Door>& doors = cell->mDoors;
+        CellRefList<ESM::Door>::List& refList = doors.mList;
+
+        // Check if any door in the cell leads to an exterior directly
+        for (CellRefList<ESM::Door>::List::iterator it = refList.begin(); it != refList.end(); ++it)
+        {
+            MWWorld::LiveCellRef<ESM::Door>& ref = *it;
+            if (ref.mRef.mTeleport && ref.mRef.mDestCell.empty())
+            {
+                ESM::Position pos = ref.mRef.mDoorDest;
+                result = Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2]);
+                return true;
+            }
+        }
+
+        // No luck :(
+        return false;
+    }
 }

apps/openmw/mwworld/worldimp.hpp

@@ -518,6 +518,8 @@ namespace MWWorld
             virtual void breakInvisibility (const MWWorld::Ptr& actor);
             // Are we in an exterior or pseudo-exterior cell and it's night?
             virtual bool isDark() const;
+
+            virtual bool findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, Ogre::Vector3& result);
     };
 }