Fix crash in FrameShowLimit

hexagonrecursion · Aug 17, 2024 · 550b934 · 550b934
1 parent 36ab303
commit 550b934
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/colobot-base/src/graphics/engine/pyro.cpp b/colobot-base/src/graphics/engine/pyro.cpp
@@ -1583,7 +1583,7 @@ void CPyro::ExploStart()
         m_camera->SetType(CAM_TYPE_EXPLO);
         m_main->DeselectAll();
     }
-    m_main->RemoveFromSelectionHistory(m_object);
+    m_main->CutObjectLink(m_object);
 
     for (int i = 0; i < OBJECTMAXPART; i++)
     {
@@ -1656,7 +1656,7 @@ void CPyro::BurnStart()
         m_camera->SetType(CAM_TYPE_EXPLO);
         m_main->DeselectAll();
     }
-    m_main->RemoveFromSelectionHistory(m_object);
+    m_main->CutObjectLink(m_object);
 
     for (int i = 0; i < OBJECTMAXPART; i++)
     {

diff --git a/colobot-base/src/level/robotmain.cpp b/colobot-base/src/level/robotmain.cpp
@@ -2071,7 +2071,7 @@ bool CRobotMain::DestroySelectedObject()
     dynamic_cast<CControllableObject&>(*obj).SetSelect(false);  // deselects the object
     m_camera->SetType(Gfx::CAM_TYPE_EXPLO);
     DeselectAll();
-    RemoveFromSelectionHistory(obj);
+    CutObjectLink(obj);
 
     return true;
 }
@@ -5910,11 +5910,16 @@ CObject* CRobotMain::PopFromSelectionHistory()
     return obj;
 }
 
-void CRobotMain::RemoveFromSelectionHistory(CObject* object)
+void CRobotMain::CutObjectLink(CObject* object)
 {
     auto it = std::remove_if(m_selectionHistory.begin(), m_selectionHistory.end(),
                              [object](const CObject* obj) { return obj == object; });
     m_selectionHistory.erase(it, m_selectionHistory.end());
+
+    for (int i = 0; i < MAXSHOWLIMIT; i++)
+    {
+        if (m_showLimit[i].link == object) FlushShowLimit(i);
+    }
 }
 
 float CRobotMain::GetGlobalMagnifyDamage()

diff --git a/colobot-base/src/level/robotmain.h b/colobot-base/src/level/robotmain.h
@@ -492,7 +492,7 @@ class CRobotMain : public CSingleton<CRobotMain>
     Error       CanFactoryError(ObjectType type, int team);
     //@}
 
-    void        RemoveFromSelectionHistory(CObject* object);
+    void        CutObjectLink(CObject* object);
 
     //! Returns global magnifyDamage setting
     float       GetGlobalMagnifyDamage();

diff --git a/colobot-base/src/object/old_object.cpp b/colobot-base/src/object/old_object.cpp
@@ -200,7 +200,7 @@ void COldObject::DeleteObject(bool bAll)
     {
         m_camera->SetControllingObject(nullptr);
     }
-    m_main->RemoveFromSelectionHistory(this);
+    m_main->CutObjectLink(this);
 
     if ( !bAll )
     {
@@ -596,7 +596,7 @@ void COldObject::DestroyObject(DestructionType type, CObject* killer)
         m_camera->SetType(Gfx::CAM_TYPE_EXPLO);
         m_main->DeselectAll();
     }
-    m_main->RemoveFromSelectionHistory(this);
+    m_main->CutObjectLink(this);
 
     CScoreboard* scoreboard = m_main->GetScoreboard();
     if (scoreboard)