ReplaceAnimation checks whether IFP is loaded or not

Author: codenulls

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -6191,13 +6191,18 @@ CAnimBlendAssociation * CClientPed::GetFirstAnimation ( void )
     return NULL;
 }
 
-void CClientPed::ReplaceAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy, CClientIFP * pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy )
+bool CClientPed::ReplaceAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy, CClientIFP * pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy )
 {
-    SReplacedAnimation replacedAnimation;
-    replacedAnimation.pIFP =  pIFP;
-    replacedAnimation.pAnimationHierarchy = pCustomAnimHierarchy;
+    if ( pIFP->isIFPLoaded ( ) )
+    {
+        SReplacedAnimation replacedAnimation;
+        replacedAnimation.pIFP =  pIFP;
+        replacedAnimation.pAnimationHierarchy = pCustomAnimHierarchy;
 
-    m_mapOfReplacedAnimations [ pInternalAnimHierarchy->GetInterface () ] = replacedAnimation;
+        m_mapOfReplacedAnimations [ pInternalAnimHierarchy->GetInterface () ] = replacedAnimation;
+        return true;
+    }
+    return false;
 }
 
 void CClientPed::RestoreAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy )

Client/mods/deathmatch/logic/CClientPed.h

@@ -478,7 +478,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     inline const SString  &     GetNextAnimationCustomBlockName ( void ) { return m_strCustomIFPBlockName; }
     inline const SString  &     GetNextAnimationCustomName      ( void ) { return m_strCustomIFPAnimationName; }
 
-    void                        ReplaceAnimation        ( CAnimBlendHierarchy * pInternalAnimHierarchy, CClientIFP * pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy );
+    bool                        ReplaceAnimation        ( CAnimBlendHierarchy * pInternalAnimHierarchy, CClientIFP * pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy );
     void                        RestoreAnimation        ( CAnimBlendHierarchy * pInternalAnimHierarchy );
     void                        RestoreAnimations       ( const CClientIFP & IFP );
     void                        RestoreAnimations       ( CAnimBlock & animationBlock );

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp

@@ -538,9 +538,11 @@ int CLuaEngineDefs::EngineReplaceAnimation ( lua_State* luaVM )
                 CAnimBlendHierarchySAInterface * pCustomAnimHierarchyInterface = pCustomIFP->GetAnimationHierarchy ( strCustomAnimName );
                 if ( pInternalAnimHierarchy && pCustomAnimHierarchyInterface )
                 { 
-                    Ped.ReplaceAnimation ( pInternalAnimHierarchy, pCustomIFP, pCustomAnimHierarchyInterface );
-                    lua_pushboolean ( luaVM, true );
-                    return 1;
+                    if ( Ped.ReplaceAnimation ( pInternalAnimHierarchy, pCustomIFP, pCustomAnimHierarchyInterface ) )
+                    { 
+                        lua_pushboolean ( luaVM, true );
+                        return 1;
+                    }
                 }    
                 else
                     argStream.SetCustomError ( "Incorrect Animation name" );