Fix source code

Author: botder

Client/mods/deathmatch/logic/CClientColTube.h

@@ -26,7 +26,7 @@ class CClientColTube final : public CClientColShape
     float GetRadius() { return m_fRadius; };
     void  SetRadius(float fRadius)
     {
-        m_fRadius = fRadius;
+        m_fRadius = (fRadius / 2.0f) + 0.15f;
         SizeChanged();
     };
     float GetHeight() { return m_fHeight; };
@@ -35,7 +35,6 @@ class CClientColTube final : public CClientColShape
         m_fHeight = fHeight;
         SizeChanged();
     };
-    float AdjustSize(float fSize);
 
 protected:
     float m_fRadius;

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -298,11 +298,6 @@ float CClientMarker::GetSize() const
     return m_pMarker->GetSize();
 }
 
-float CClientColTube::AdjustSize(float fSize)
-{
-    return (fSize / 2.0f) + 0.15f;  
-}
-
 void CClientMarker::SetSize(float fSize)
 {
     switch (m_pCollision->GetShapeType())
@@ -322,7 +317,7 @@ void CClientMarker::SetSize(float fSize)
         case COLSHAPE_TUBE:
         {
             CClientColTube* pShape = static_cast<CClientColTube*>(m_pCollision);
-            pShape->SetRadius(pShape->AdjustSize(fSize));
+            pShape->SetRadius(fSize);
             pShape->SetHeight(fSize);
             break;
         }

Server/mods/deathmatch/logic/CColTube.h

@@ -27,7 +27,7 @@ class CColTube : public CColShape
     float GetRadius() { return m_fRadius; };
     void  SetRadius(float fRadius)
     {
-        m_fRadius = fRadius;
+        m_fRadius = (fRadius / 2.0f) + 0.15f;
         SizeChanged();
     };
     float GetHeight() { return m_fHeight; };
@@ -36,7 +36,6 @@ class CColTube : public CColShape
         m_fHeight = fHeight;
         SizeChanged();
     };
-    float AdjustSize(float fSize);
 
 protected:
     bool ReadSpecialData(const int iLine) override;

Server/mods/deathmatch/logic/CMarker.cpp

@@ -384,11 +384,6 @@ void CMarker::Callback_OnCollisionDestroy(CColShape* pCollision)
         m_pCollision = NULL;
 }
 
-float CColTube::AdjustSize(float fSize)
-{
-    return (fSize / 2.0f) + 0.15f; 
-}
-
 void CMarker::UpdateCollisionObject(unsigned char ucOldType)
 {
     // Different type than before?
@@ -401,19 +396,22 @@ void CMarker::UpdateCollisionObject(unsigned char ucOldType)
         {
             if (m_pCollision)
                 g_pGame->GetElementDeleter()->Delete(m_pCollision);
-                m_pCollision = new CColCircle(m_pColManager, nullptr, m_vecPosition, m_fSize, true);
+
+            m_pCollision = new CColCircle(m_pColManager, nullptr, m_vecPosition, m_fSize, true);
         }
         else if (m_ucType == CMarker::TYPE_CYLINDER)
         {
             if (m_pCollision)
                 g_pGame->GetElementDeleter()->Delete(m_pCollision);
-                m_pCollision = new CColTube(m_pColManager, nullptr, m_vecPosition, m_fSize, m_fSize);
+
+            m_pCollision = new CColTube(m_pColManager, nullptr, m_vecPosition, m_fSize, m_fSize);
         }
         else if (ucOldType == CMarker::TYPE_CHECKPOINT)
         {
             if (m_pCollision)
                 g_pGame->GetElementDeleter()->Delete(m_pCollision);
-                m_pCollision = new CColSphere(m_pColManager, nullptr, m_vecPosition, m_fSize, true);
+            
+            m_pCollision = new CColSphere(m_pColManager, nullptr, m_vecPosition, m_fSize, true);
         }
 
         m_pCollision->SetCallback(this);
@@ -429,7 +427,7 @@ void CMarker::UpdateCollisionObject(unsigned char ucOldType)
     else if (m_ucType == CMarker::TYPE_CYLINDER)
     {
         CColTube* pShape = static_cast<CColTube*>(m_pCollision);
-        pShape->SetRadius(pShape->AdjustSize(m_fSize));
+        pShape->SetRadius(m_fSize);
         pShape->SetHeight(m_fSize);
     }
     else