Improve cloneElement

Server/mods/deathmatch/logic/CBlip.cpp

@@ -36,6 +36,24 @@ CBlip::~CBlip ( void )
 }
 
 
+CElement* CBlip::Clone ( bool* bAddEntity, CResource* pResource )
+{
+    CBlip* pTemp = m_pBlipManager->Create ( GetParentEntity () );
+    if ( pTemp )
+    {
+        pTemp->m_ucIcon = m_ucIcon;
+        pTemp->m_ucSize = m_ucSize;
+        pTemp->SetColor ( GetColor () );
+
+        if ( pResource->HasStarted () )
+            pTemp->Sync ( true );
+        *bAddEntity = false;
+    }
+
+    return pTemp;
+}
+
+
 void CBlip::Unlink ( void )
 {
     // Remove us from the manager's list

Server/mods/deathmatch/logic/CBlip.h

@@ -24,6 +24,8 @@ class CBlip : public CPerPlayerEntity
                                 CBlip                    ( CElement* pParent, CXMLNode* pNode, class CBlipManager* pBlipManager );
                                 ~CBlip                   ( void );
 
+    CElement*                   Clone                    ( bool* bAddEntity, CResource* pResource );
+
     void                        Unlink                   ( void );
     bool                        ReadSpecialData          ( void );
 

Server/mods/deathmatch/logic/CDummy.cpp

@@ -35,6 +35,15 @@ CDummy::~CDummy ( void )
 }
 
 
+CElement* CDummy::Clone ( bool* bAddEntity, CResource* pResource )
+{
+    CElement* pNewElement = new CDummy ( g_pGame->GetGroups (), GetParentEntity () );
+    pNewElement->SetName ( GetName () );
+    pNewElement->SetTypeName ( GetTypeName () );
+    return pNewElement;
+}
+
+
 void CDummy::Unlink ( void )
 {
     // Remove us from groupmanager's list

Server/mods/deathmatch/logic/CDummy.h

@@ -22,6 +22,8 @@ class CDummy : public CElement
                             CDummy              ( class CGroups* pGroups, CElement* pParent, CXMLNode* pNode = NULL );
                             ~CDummy             ( void );
 
+    CElement*               Clone               ( bool* bAddEntity, CResource* pResource );
+
     bool                    IsEntity            ( void )                    { return true; }
 
     void                    Unlink              ( void );

Server/mods/deathmatch/logic/CElement.cpp

@@ -1258,6 +1258,26 @@ void CElement::GetAttachedRotation ( CVector & vecRotation )
 }
 
 
+bool CElement::IsCloneable ( void )
+{
+    int iType = GetType ();
+    switch ( iType )
+    {
+        case CElement::DUMMY:
+        case CElement::VEHICLE:
+        case CElement::OBJECT:
+        case CElement::MARKER:
+        case CElement::BLIP:
+        case CElement::PICKUP:
+        case CElement::RADAR_AREA:
+        case CElement::PATH_NODE_UNUSED:
+            return true;
+        default:
+            return false;
+    }
+}
+
+
 unsigned char CElement::GenerateSyncTimeContext ( void )
 {
     // Increment the sync time index

Server/mods/deathmatch/logic/CElement.h

@@ -93,6 +93,9 @@ class CElement
                                                 CElement                    ( CElement* pParent, CXMLNode* pNode = NULL );
     virtual                                     ~CElement                   ( void );
 
+    virtual CElement*                           Clone                       ( bool* bAddEntity, CResource* pResource ) { return nullptr; };
+    bool                                        IsCloneable                 ( void );
+
     inline bool                                 IsBeingDeleted              ( void )                        { return m_bIsBeingDeleted; };
     inline void                                 SetIsBeingDeleted           ( bool bBeingDeleted )          { m_bIsBeingDeleted = bBeingDeleted; };
     virtual void                                Unlink                      ( void ) = 0;

Server/mods/deathmatch/logic/CMarker.cpp

@@ -50,6 +50,24 @@ CMarker::~CMarker ( void )
 }
 
 
+CElement* CMarker::Clone ( bool* bAddEntity, CResource* pResource )
+{
+    CMarker* pTemp = m_pMarkerManager->Create ( GetParentEntity () );
+    if ( pTemp )
+    {
+        pTemp->SetMarkerType ( GetMarkerType () );
+        pTemp->SetColor ( GetColor () );
+        pTemp->SetSize ( GetSize () );
+
+        if ( pResource->HasStarted () )
+            pTemp->Sync ( true );
+        *bAddEntity = false;
+    }
+
+    return pTemp;
+}
+
+
 void CMarker::Unlink ( void )
 {
     // Remove us from the marker manager

Server/mods/deathmatch/logic/CMarker.h

@@ -48,6 +48,8 @@ class CMarker : public CPerPlayerEntity, private CColCallback
                             CMarker                 ( class CMarkerManager* pMarkerManager, CColManager* pColManager, CElement* pParent, CXMLNode* pNode );
                             ~CMarker                ( void );
 
+    CElement*               Clone                   ( bool* bAddEntity, CResource* pResource );
+
     void                    Unlink                  ( void );
     bool                    ReadSpecialData         ( void );
 

Server/mods/deathmatch/logic/CObject.cpp

@@ -47,10 +47,21 @@ CObject::CObject ( const CObject& Copy ) : CElement ( Copy.m_pParent, Copy.m_pXM
     , m_pLowLodObject ( Copy.m_pLowLodObject )
 {
     // Init
+    m_iType = CElement::OBJECT;
+    SetTypeName ( "object" );
+
     m_pObjectManager = Copy.m_pObjectManager;
     m_usModel = Copy.m_usModel;
     m_vecPosition = Copy.m_vecPosition;
     m_vecRotation = Copy.m_vecRotation;
+    m_ucAlpha = Copy.m_ucAlpha;
+    m_vecScale = CVector ( Copy.m_vecScale.fX, Copy.m_vecScale.fY, Copy.m_vecScale.fZ );
+    m_fHealth = Copy.m_fHealth;
+    m_bSyncable = Copy.m_bSyncable;
+    m_pSyncer = Copy.m_pSyncer;
+    m_bIsFrozen = Copy.m_bIsFrozen;
+    m_bDoubleSided = Copy.m_bDoubleSided;
+    m_bBreakable = Copy.m_bBreakable;
 
     m_pMoveAnimation = NULL;
     if ( Copy.m_pMoveAnimation != NULL )
@@ -82,6 +93,12 @@ CObject::~CObject ( void )
 }
 
 
+CElement* CObject::Clone ( bool* bAddEntity, CResource* pResource )
+{    
+    return new CObject ( *this ); 
+}
+
+
 void CObject::Unlink ( void )
 {
     // Remove us from the manager's list

Server/mods/deathmatch/logic/CObject.h

@@ -31,6 +31,8 @@ class CObject : public CElement
     explicit                    CObject                 ( const CObject& Copy );
                                 ~CObject                ( void );
 
+    CElement*                   Clone                   ( bool* bAddEntity, CResource* pResource );
+
     bool                        IsEntity                ( void )                    { return true; }
 
     void                        Unlink                  ( void );

Server/mods/deathmatch/logic/CPed.cpp

@@ -104,6 +104,22 @@ CPed::~CPed ( void )
 }
 
 
+CElement* CPed::Clone ( bool* bAddEntity, CResource* pResource )
+{
+    CPed* pTemp = m_pPedManager->Create ( GetModel (), GetParentEntity (), NULL );
+    if ( pTemp )
+    {
+        pTemp->SetPosition ( GetPosition () );
+        pTemp->SetRotation ( GetRotation () );
+        pTemp->SetHealth ( GetHealth () );
+        pTemp->SetArmor ( GetArmor () );
+        pTemp->SetSyncable ( IsSyncable () );
+    }
+
+    return pTemp;
+}
+
+
 void CPed::Unlink ( void )
 {
     // Remove us from the Ped manager

Server/mods/deathmatch/logic/CPed.h

@@ -133,6 +133,8 @@ class CPed: public CElement
                                                 CPed                        ( class CPedManager* pPedManager, CElement* pParent, CXMLNode* pNode, unsigned short usModel );
                                                 ~CPed                       ( void );
 
+    CElement*                                   Clone                       ( bool* bAddEntity, CResource* pResource );
+
     bool                                        IsEntity                    ( void )                    { return true; }
 
     virtual void                                Unlink                      ( void );

Server/mods/deathmatch/logic/CPickup.cpp

@@ -61,6 +61,22 @@ CPickup::~CPickup ( void )
 }
 
 
+CElement* CPickup::Clone ( bool* bAddEntity, CResource* pResource )
+{
+    CPickup* pTemp = m_pPickupManager->Create ( GetParentEntity () );
+    if ( pTemp )
+    {
+        pTemp->SetPickupType ( GetPickupType () );
+        pTemp->SetModel ( GetModel () );
+        pTemp->SetWeaponType ( GetWeaponType () );
+        pTemp->SetAmmo ( GetAmmo () );
+        pTemp->SetRespawnIntervals ( GetRespawnIntervals () );
+    }
+
+    return pTemp;
+}
+
+
 void CPickup::Unlink ( void )
 {
     // Remove us from the pickup manager's list
@@ -546,4 +562,4 @@ void CPickup::Callback_OnCollisionDestroy ( CColShape* pCollision )
 {
     if ( pCollision == m_pCollision )
         m_pCollision = NULL;
-}
+}

Server/mods/deathmatch/logic/CPickup.h

@@ -95,6 +95,8 @@ class CPickup : public CElement, private CColCallback
                                     CPickup                     ( CElement* pParent, CXMLNode* pNode, class CPickupManager* pPickupManager, CColManager* pColManager );
                                     ~CPickup                    ( void );
 
+    CElement*                       Clone                       ( bool* bAddEntity, CResource* pResource );
+
     bool                            IsEntity                    ( void )                    { return true; }
 
     void                            Unlink                      ( void );

Server/mods/deathmatch/logic/CRadarArea.cpp

@@ -33,6 +33,23 @@ CRadarArea::~CRadarArea ( void )
 }
 
 
+CElement* CRadarArea::Clone ( bool* bAddEntity, CResource* pResource )
+{
+    CRadarArea* pTemp = m_pRadarAreaManager->Create ( GetParentEntity (), NULL );
+    if ( pTemp )
+    {
+        pTemp->SetSize ( GetSize () );
+        pTemp->SetColor ( GetColor () );
+
+        if ( pResource->HasStarted () )
+            pTemp->Sync ( true );
+        *bAddEntity = false;
+    }
+
+    return pTemp;
+}
+
+
 void CRadarArea::Unlink ( void )
 {
     // Remove us from the manager's list

Server/mods/deathmatch/logic/CRadarArea.h

@@ -23,6 +23,8 @@ class CRadarArea : public CPerPlayerEntity
 public:
                                 ~CRadarArea                     ( void );
 
+    CElement*                   Clone                           ( bool* bAddEntity, CResource* pResource );
+
     void                        Unlink                          ( void );
 
     bool                        ReadSpecialData                 ( void );