Potential fix for #1683 (#1693)

* Fix #1683: build r20653 crashing randomly without dump

* safely delete marker's colshape in CClientMarker

* Remove attaching code in CMarker

This was added by Lopsided. It shouldn't be here.

Co-authored-by: saml1er <[email protected]>

Author: saml1er

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -39,15 +39,15 @@ CClientMarker::CClientMarker(CClientManager* pManager, ElementID ID, int iMarker
 
 CClientMarker::~CClientMarker()
 {
+    AttachTo(nullptr);
+
     // Unlink
     Unlink();
 
     // Make sure nothing is still referencing us
     m_pManager->UnreferenceEntity(this);
 
-    // Remove the colshape
-    if (m_pCollision)
-        delete m_pCollision;
+    SAFE_DELETE(m_pCollision)
 
     // Stream out first so the element counter is correct
     StreamOut();
@@ -74,26 +74,33 @@ void CClientMarker::GetPosition(CVector& vecPosition) const
     }
     else
     {
-        vecPosition = CVector();
+        vecPosition = m_vecPosition;
     }
 }
 
 void CClientMarker::SetPosition(const CVector& vecPosition)
 {
-    if (m_pMarker)
-        m_pMarker->SetPosition(vecPosition);
-    if (m_pCollision)
-        m_pCollision->SetPosition(vecPosition);
-
-    // Update our streaming position
-    UpdateStreamPosition(vecPosition);
+    if (m_vecPosition != vecPosition)
+    {
+        m_vecPosition = vecPosition;
+        if (m_pMarker)
+            m_pMarker->SetPosition(vecPosition);
+        if (m_pCollision)
+            m_pCollision->SetPosition(vecPosition);
+
+        // Update our streaming position
+        UpdateStreamPosition(vecPosition);
+    }
 }
 
 void CClientMarker::AttachTo(CClientEntity* pEntity)
 {
     CClientEntity::AttachTo(pEntity);
-    if (m_pCollision)
-        m_pCollision->AttachTo(this);
+    if (m_pAttachedToEntity)
+    {
+        DoAttaching();
+        UpdateStreamPosition(m_vecPosition);
+    }
 }
 
 void CClientMarker::SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation)

Client/mods/deathmatch/logic/CClientMarker.h

@@ -94,6 +94,7 @@ class CClientMarker : public CClientStreamElement, private CClientColCallback
     CClientMarkerManager* m_pMarkerManager;
     CClientMarkerCommon*  m_pMarker;
 
+    CVector             m_vecPosition;
     static unsigned int m_uiStreamedInMarkers;
 
     CClientColShape* m_pCollision;

Server/mods/deathmatch/logic/CMarker.cpp

@@ -171,22 +171,6 @@ void CMarker::SetPosition(const CVector& vecPosition)
     }
 }
 
-void CMarker::AttachTo(CElement* pElement)
-{
-    CElement::AttachTo(pElement);
-    if (m_pCollision)
-        m_pCollision->AttachTo(this);
-}
-
-void CMarker::SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation)
-{
-    CElement::SetAttachedOffsets(vecPosition, vecRotation);
-    if (m_pCollision)
-    {
-        m_pCollision->SetAttachedOffsets(vecPosition, vecRotation);
-    }
-}
-
 void CMarker::SetTarget(const CVector* pTargetVector)
 {
     // Got a target vector?

Server/mods/deathmatch/logic/CMarker.h

@@ -61,9 +61,6 @@ class CMarker : public CPerPlayerEntity, private CColCallback
     void SetSize(float fSize);
     void SetColor(const SColor color);
 
-    void AttachTo(CElement* pElement);
-    void SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation);
-
     void SetIcon(unsigned char ucIcon);
 
     CColShape* GetColShape() { return m_pCollision; }