0008193: Add possibility to clone ColShape

Server/mods/deathmatch/logic/CColCircle.cpp

@@ -25,6 +25,12 @@ CColCircle::CColCircle ( CColManager* pManager, CElement* pParent, const CVector
 }
 
 
+CColCircle* CColCircle::Clone ( CColManager* pManager ) 
+{
+    return new CColCircle ( pManager, this->m_pParent, this->m_vecPosition, this->m_fRadius, this->m_pXMLNode, this->IsPartnered() );
+}
+
+
 bool CColCircle::DoHitDetection ( const CVector& vecNowPosition )
 {
     // Do a simple distance check between now position and our position 

Server/mods/deathmatch/logic/CColCircle.h

@@ -21,6 +21,7 @@ class CColCircle : public CColShape
 public:
                     CColCircle      ( CColManager* pManager, CElement* pParent, const CVector2D& vecPosition, float fRadius, CXMLNode* pNode = NULL, bool bIsPartnered = false );
 
+    CColCircle*     Clone           ( CColManager* pManager );
     virtual CSphere         GetWorldBoundingSphere  ( void );
 
     eColShapeType   GetShapeType    ( void )            { return COLSHAPE_CIRCLE; }

Server/mods/deathmatch/logic/CColCuboid.cpp

@@ -22,6 +22,12 @@ CColCuboid::CColCuboid ( CColManager* pManager, CElement* pParent, const CVector
 }
 
 
+CColCuboid* CColCuboid::Clone ( CColManager* pManager ) 
+{
+    return new CColCuboid ( pManager, this->m_pParent, this->m_vecPosition, this->m_vecSize, this->m_pXMLNode );
+}
+
+
 bool CColCuboid::DoHitDetection  ( const CVector& vecNowPosition )
 {
     // FIXME: What about radius?

Server/mods/deathmatch/logic/CColCuboid.h

@@ -19,7 +19,8 @@ class CColCuboid : public CColShape
 {
 public:
                             CColCuboid      ( CColManager* pManager, CElement* pParent, const CVector& vecPosition, const CVector& vecSize, CXMLNode* pNode = NULL );
-
+
+    CColCuboid*             Clone           ( CColManager* pManager );
     virtual CSphere         GetWorldBoundingSphere  ( void );
 
     eColShapeType           GetShapeType    ( void )            { return COLSHAPE_CUBOID; }

Server/mods/deathmatch/logic/CColPolygon.cpp

@@ -22,6 +22,14 @@ CColPolygon::CColPolygon ( CColManager* pManager, CElement* pParent, const CVect
 }
 
 
+CColPolygon* CColPolygon::Clone ( CColManager* pManager ) 
+{
+    CColPolygon* pNewCol = new CColPolygon ( pManager, this->m_pParent, this->m_vecPosition, this->m_pXMLNode );
+    pNewCol->m_Points = this->m_Points;
+    return pNewCol;
+}
+
+
 bool CColPolygon::DoHitDetection  ( const CVector& vecNowPosition )
 {
     if ( !IsInBounds ( vecNowPosition ) )

Server/mods/deathmatch/logic/CColPolygon.h

@@ -22,6 +22,7 @@ class CColPolygon : public CColShape
 public:
                                 CColPolygon         ( CColManager* pManager, CElement* pParent, const CVector& vecPosition, CXMLNode* pNode = NULL );
 
+    CColPolygon*                Clone               ( CColManager* pManager );
     virtual CSphere         GetWorldBoundingSphere  ( void );
 
     eColShapeType               GetShapeType        ( void )                { return COLSHAPE_POLYGON; }

Server/mods/deathmatch/logic/CColRectangle.cpp

@@ -24,6 +24,12 @@ CColRectangle::CColRectangle ( CColManager* pManager, CElement* pParent, const C
 }
 
 
+CColRectangle* CColRectangle::Clone ( CColManager* pManager ) 
+{
+    return new CColRectangle ( pManager, this->m_pParent, this->m_vecPosition, this->m_vecSize, this->m_pXMLNode );
+}
+
+
 bool CColRectangle::DoHitDetection ( const CVector& vecNowPosition )
 {
     // FIXME: What about radius?

Server/mods/deathmatch/logic/CColRectangle.h

@@ -21,6 +21,7 @@ class CColRectangle : public CColShape
 public:
                             CColRectangle   ( CColManager* pManager, CElement* pParent, const CVector2D& vecPosition, const CVector2D& vecSize, CXMLNode* pNode = NULL );
 
+    CColRectangle*          Clone           ( CColManager* pManager );
     virtual CSphere         GetWorldBoundingSphere  ( void );
 
     eColShapeType           GetShapeType    ( void )                        { return COLSHAPE_RECTANGLE; }

Server/mods/deathmatch/logic/CColShape.cpp

@@ -41,6 +41,25 @@ CColShape::~CColShape ( void )
 }
 
 
+CColShape* CColShape::Clone ( CColManager* pManager ) {
+    switch ( this->GetShapeType () ) {
+        case COLSHAPE_CIRCLE:
+            return static_cast < CColCircle* > ( this )->Clone ( pManager );
+        case COLSHAPE_CUBOID:
+            return static_cast < CColCuboid* > ( this )->Clone ( pManager );
+        case COLSHAPE_POLYGON:
+            return static_cast < CColPolygon* > ( this )->Clone ( pManager );
+        case COLSHAPE_RECTANGLE:
+            return static_cast < CColRectangle* > ( this )->Clone ( pManager );
+        case COLSHAPE_SPHERE:
+            return static_cast < CColSphere* > ( this )->Clone ( pManager );
+        case COLSHAPE_TUBE:
+            return static_cast < CColTube* > ( this )->Clone ( pManager );
+    }
+    return NULL;
+} 
+
+
 void CColShape::Unlink ( void )
 {
     // Remove us from manager's list

Server/mods/deathmatch/logic/CColShape.h

@@ -32,6 +32,7 @@ class CColShape : public CElement
                                 CColShape           ( class CColManager* pManager, CElement* pParent, CXMLNode* pNode = NULL, bool bIsPartnered = false );
     virtual                     ~CColShape          ( void );
 
+    virtual CColShape*          Clone               ( CColManager* pManager );
     virtual eColShapeType       GetShapeType        ( void ) = 0;
 
     void                        Unlink              ( void );

Server/mods/deathmatch/logic/CColSphere.cpp

@@ -23,6 +23,12 @@ CColSphere::CColSphere ( CColManager* pManager, CElement* pParent, const CVector
 }
 
 
+CColSphere* CColSphere::Clone ( CColManager* pManager ) 
+{
+    return new CColSphere ( pManager, this->m_pParent, this->m_vecPosition, this->m_fRadius, this->m_pXMLNode, this->IsPartnered() );
+}
+
+
 bool CColSphere::DoHitDetection ( const CVector& vecNowPosition )
 {
     // Do a simple distance check between now position and our position 
@@ -45,4 +51,4 @@ bool CColSphere::ReadSpecialData ( void )
 CSphere CColSphere::GetWorldBoundingSphere ( void )
 {
     return CSphere ( m_vecPosition, m_fRadius );
-}
+}

Server/mods/deathmatch/logic/CColSphere.h

@@ -21,6 +21,7 @@ class CColSphere : public CColShape
 public:
                     CColSphere      ( CColManager* pManager, CElement* pParent, const CVector& vecPosition, float fRadius, CXMLNode* pNode = NULL, bool bIsPartnered = false );
 
+    CColSphere*     Clone           ( CColManager* pManager );
     virtual CSphere         GetWorldBoundingSphere  ( void );
 
     eColShapeType   GetShapeType    ( void )            { return COLSHAPE_SPHERE; }

Server/mods/deathmatch/logic/CColTube.cpp

@@ -22,6 +22,12 @@ CColTube::CColTube ( CColManager* pManager, CElement* pParent, const CVector& ve
 }
 
 
+CColTube* CColTube::Clone ( CColManager* pManager ) 
+{
+    return new CColTube ( pManager, this->m_pParent, this->m_vecPosition, this->m_fRadius, this->m_fHeight, this->m_pXMLNode );
+}
+
+
 bool CColTube::DoHitDetection ( const CVector& vecNowPosition )
 {
     // FIXME: What about radius in height?

Server/mods/deathmatch/logic/CColTube.h

@@ -21,6 +21,7 @@ class CColTube : public CColShape
 public:
                             CColTube        ( CColManager* pManager, CElement* pParent, const CVector& vecPosition, float fRadius, float fHeight, CXMLNode* pNode = NULL );
 
+    CColTube*               Clone           ( CColManager* pManager ); 
     virtual CSphere         GetWorldBoundingSphere  ( void );
 
     eColShapeType           GetShapeType    ( void )            { return COLSHAPE_TUBE; }

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -349,6 +349,7 @@ CElement* CStaticFunctionDefinitions::CloneElement ( CResource* pResource, CElem
             case CElement::PICKUP:
             case CElement::RADAR_AREA:
             case CElement::PATH_NODE_UNUSED:
+            case CElement::COLSHAPE:
                 break;
             default:
                 return NULL;
@@ -512,6 +513,13 @@ CElement* CStaticFunctionDefinitions::CloneElement ( CResource* pResource, CElem
             }
             break;
         }
+        case CElement::COLSHAPE:
+        {  
+            CColShape* pColShape = static_cast < CColShape* > ( pElement );
+
+            pNewElement = pColShape->Clone ( m_pColManager );
+            break;
+        }
     }
 
     if ( pNewElement )