Fix engineIFPLoad failure on resource multiple restarts

IFP was failing to load after restarting resource multiple times, because it was removed from map in CElementDeleter::DeleteIFP which caused a small delay in ms. Now, it will be removed from map when it's added to element deleter list, so engineLoadIFP won't fail because the element with the same block name does not exist in map anymore.

Author: codenulls

Client/mods/deathmatch/logic/CClientIFP.cpp

@@ -15,6 +15,7 @@ CClientIFP::CClientIFP ( class CClientManager* pManager, ElementID ID ) : CClien
 
 CClientIFP::~CClientIFP ( void )
 {
+   //g_pCore->GetConsole ()->Printf( "CClientIFP::~CClientIFP called! BlockName: %s", m_strBlockName.c_str ( ) );
 }
 
 bool CClientIFP::LoadIFP ( const char* szFilePath, const SString & strBlockName )

Client/mods/deathmatch/logic/CElementDeleter.cpp

@@ -35,6 +35,8 @@ void CElementDeleter::Delete ( class CClientEntity* pElement )
         // Add it to our list
         if ( !pElement->IsBeingDeleted () )
         {
+            // Just to be clear, not a Lua event
+            OnClientSpecialElementDestroy ( pElement );
             m_List.push_back ( pElement );
         }
 
@@ -68,6 +70,8 @@ void CElementDeleter::DeleteRecursive ( class CClientEntity* pElement )
     // Add it to our list over deleting objects
     if ( !pElement->IsBeingDeleted () )
     {
+        // Just to be clear, not a Lua event
+        OnClientSpecialElementDestroy ( pElement );
         m_List.push_back ( pElement );
     }
 
@@ -94,15 +98,14 @@ void CElementDeleter::DeleteIFP  ( CClientEntity * pElement )
 {
     CClientIFP & IFP = static_cast < CClientIFP& > ( *pElement );
     const unsigned int u32BlockNameHash = IFP.GetBlockNameHash ( );
-    std::shared_ptr < CClientIFP > pIFP = g_pClientGame->GetIFPPointerFromMap ( u32BlockNameHash );
-    if ( pIFP )
-    { 
-        // Remove IFP from map, so we can indicate that it does not exist
-        g_pClientGame->RemoveIFPPointerFromMap ( u32BlockNameHash );
-
-        // Remove IFP animations from replaced animations of peds/players
-        g_pClientGame->OnClientIFPUnload ( pIFP );
-    }
+    for ( auto it = m_vecIFPElements.begin ( ); it != m_vecIFPElements.end ( ); ++it ) 
+    {
+        if ( (*it)->GetBlockNameHash ( ) == u32BlockNameHash )
+        {
+            m_vecIFPElements.erase ( it );
+            break;
+        }
+    }   
 }
 
 
@@ -130,6 +133,38 @@ void CElementDeleter::DoDeleteAll ( void )
 }
 
 
+bool CElementDeleter::OnClientSpecialElementDestroy ( CClientEntity* pElement )
+{
+    if ( IS_IFP ( pElement ) )
+    {
+        OnClientIFPElementDestroy ( pElement );
+        return true;       
+    }
+    return false;
+}
+
+
+void CElementDeleter::OnClientIFPElementDestroy  ( CClientEntity * pElement )
+{
+    CClientIFP & IFP = static_cast < CClientIFP& > ( *pElement );
+    const unsigned int u32BlockNameHash = IFP.GetBlockNameHash ( );
+
+    std::shared_ptr < CClientIFP > pIFP = g_pClientGame->GetIFPPointerFromMap ( u32BlockNameHash );
+    if ( pIFP )
+    { 
+        // Remove IFP from map, so we can indicate that it does not exist
+        g_pClientGame->RemoveIFPPointerFromMap ( u32BlockNameHash );
+
+        // Remove IFP animations from replaced animations of peds/players
+        g_pClientGame->OnClientIFPUnload ( pIFP );
+
+        // keep a reference to shared_ptr CClientIFP in list, so it does not get 
+        // destroyed after exiting this function
+        m_vecIFPElements.push_back ( pIFP );
+    }
+}
+
+
 bool CElementDeleter::IsBeingDeleted ( CClientEntity* pElement )
 {
     return m_List.Contains ( pElement );

Client/mods/deathmatch/logic/CElementDeleter.h

@@ -15,30 +15,35 @@
 #ifndef __CELEMENTDELETER_H
 #define __CELEMENTDELETER_H
 
+#include <memory>
 #include <list>
 
 class CElementDeleter
 {
 public:
-                                CElementDeleter         ( void );
-    inline                      ~CElementDeleter        ( void )        { DoDeleteAll (); };
+                                CElementDeleter               ( void );
+    inline                      ~CElementDeleter              ( void )        { DoDeleteAll (); };
 
-    void                        Delete                  ( class CClientEntity* pElement );
-    void                        DeleteRecursive         ( class CClientEntity* pElement );
-    bool                        DeleteElementSpecial    ( CClientEntity* pElement );
-    void                        DeleteIFP               ( CClientEntity * pElement );
+    void                        Delete                        ( class CClientEntity* pElement );
+    void                        DeleteRecursive               ( class CClientEntity* pElement );
+    bool                        DeleteElementSpecial          ( CClientEntity* pElement );
+    void                        DeleteIFP                     ( CClientEntity * pElement );
 
-    void                        DoDeleteAll             ( void );
+    void                        DoDeleteAll                   ( void );
+    bool                        OnClientSpecialElementDestroy ( CClientEntity* pElement );
+    void                        OnClientIFPElementDestroy     ( CClientEntity * pElement );
+    bool                        IsBeingDeleted                ( class CClientEntity* pElement );
 
-    bool                        IsBeingDeleted          ( class CClientEntity* pElement );
+    void                        Unreference                   ( class CClientEntity* pElement );
 
-    void                        Unreference             ( class CClientEntity* pElement );
-
-    void                        CleanUpForVM            ( CLuaMain* pLuaMain );
+    void                        CleanUpForVM                  ( CLuaMain* pLuaMain );
 
 private:
-    CMappedList < class CClientEntity* >    m_List;
-    bool                                    m_bAllowUnreference;
+    CMappedList < class CClientEntity* >                  m_List;
+    // We are using shared_ptr for CClientIFP, and we must keep a reference 
+    // somewhere, so this is it.
+    std::vector < std::shared_ptr < class CClientIFP > > m_vecIFPElements;
+    bool                                                  m_bAllowUnreference;
 };
 
 #endif