From d148ccbb93de5bb8b9b0ca2bba21392e7143369b Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 8 Sep 2025 18:12:05 +0200
Subject: [PATCH] Remove logically redundant code

---
 apps/openmw/mwgui/hud.cpp         |  1 -
 apps/openmw/mwgui/mapwindow.cpp   | 15 +--------------
 apps/openmw/mwgui/mapwindow.hpp   |  1 -
 apps/openmw/mwrender/localmap.cpp |  5 -----
 apps/openmw/mwrender/localmap.hpp |  1 -
 5 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 167bf28fc5..1927f8899c 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -635,7 +635,6 @@ namespace MWGui
         mSpellBox->setUserData(MyGUI::Any::Null);
 
         mActiveCell = nullptr;
-        mHasALastActiveCell = false;
     }
 
     void HUD::customMarkerCreated(MyGUI::Widget* marker)
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 49e98f816d..5068518159 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -394,8 +394,7 @@ namespace MWGui
             mExteriorDoorMarkerWidgets.clear();
             for (auto& [coord, doors] : mExteriorDoorsByCell)
             {
-                if (!mHasALastActiveCell || !mGrid.inside({ coord.first, coord.second })
-                    || activeGrid.inside({ coord.first, coord.second }))
+                if (!mGrid.inside({ coord.first, coord.second }) || activeGrid.inside({ coord.first, coord.second }))
                 {
                     mDoorMarkersToRecycle.insert(mDoorMarkersToRecycle.end(), doors.begin(), doors.end());
                     doors.clear();
@@ -406,15 +405,6 @@ namespace MWGui
 
             for (auto& widget : mDoorMarkersToRecycle)
                 widget->setVisible(false);
-
-            if (mHasALastActiveCell)
-            {
-                for (const auto& entry : mMaps)
-                {
-                    if (!mGrid.inside({ entry.mCellX, entry.mCellY }))
-                        mLocalMapRender->removeExteriorCell(entry.mCellX, entry.mCellY);
-                }
-            }
         }
         else
             mGrid = mLocalMapRender->getInteriorGrid();
@@ -463,9 +453,6 @@ namespace MWGui
         for (MyGUI::Widget* widget : currentDoorMarkersWidgets())
             widget->setCoord(getMarkerCoordinates(widget, 8));
 
-        if (mActiveCell->isExterior())
-            mHasALastActiveCell = true;
-
         updateMagicMarkers();
         updateCustomMarkers();
     }
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index c4e9998e5a..fe4d70fb12 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -119,7 +119,6 @@ namespace MWGui
         MyGUI::ScrollView* mLocalMap = nullptr;
         MyGUI::ImageBox* mCompass = nullptr;
         float mLocalMapZoom = 1.f;
-        bool mHasALastActiveCell = false;
         bool mFogOfWarToggled = true;
         bool mFogOfWarEnabled;
         bool mNeedDoorMarkersUpdate = false;
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 539e854bef..cec3c3a6d8 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -205,11 +205,6 @@ namespace MWRender
                 std::make_pair(cell->getCell()->getGridX(), cell->getCell()->getGridY()), MapSegment{});
     }
 
-    void LocalMap::removeExteriorCell(int x, int y)
-    {
-        mExteriorSegments.erase({ x, y });
-    }
-
     void LocalMap::removeCell(MWWorld::CellStore* cell)
     {
         saveFogOfWar(cell);
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index c5b63766b7..aa27b489f9 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -55,7 +55,6 @@ namespace MWRender
         void requestMap(const MWWorld::CellStore* cell);
 
         void addCell(MWWorld::CellStore* cell);
-        void removeExteriorCell(int x, int y);
 
         void removeCell(MWWorld::CellStore* cell);