Added CIFPEngine which contains most logic for Lua IFP functions

Author: codenulls

Client/mods/deathmatch/StdInc.h

@@ -94,6 +94,7 @@
 #include <CLogger.h>
 #include <CMapEventManager.h>
 #include <CModelNames.h>
+#include <CIFPEngine.h>
 #include <CScriptFile.h>
 #include <CWeaponNames.h>
 #include <CVehicleNames.h>

Client/mods/deathmatch/logic/CIFPEngine.cpp

@@ -0,0 +1,84 @@
+#include <StdInc.h>
+
+std::shared_ptr < CClientIFP > CIFPEngine::EngineLoadIFP ( CResource * pResource, CClientManager * pManager, const SString & strPath, const SString & strBlockName )
+{
+    // Grab the resource root entity
+    CClientEntity* pRoot = pResource->GetResourceIFPRoot ( );
+                    
+    // Check whether the IFP blockname exists or not
+    if ( g_pClientGame->GetIFPPointerFromMap ( strBlockName ) == nullptr )
+    { 
+        // Create a IFP element
+        std::shared_ptr < CClientIFP > pIFP ( new CClientIFP ( pManager, INVALID_ELEMENT_ID ) );
+
+        // Try to load the IFP file
+        if ( pIFP->LoadIFP ( strPath, strBlockName ) )
+        {
+            // We can use the map to retrieve correct IFP by block name later
+            g_pClientGame->InsertIFPPointerToMap ( strBlockName, pIFP );
+
+            // Success loading the file. Set parent to IFP root
+            pIFP->SetParent ( pRoot );
+            return pIFP;
+        }
+    }
+    return nullptr;
+}
+
+bool CIFPEngine::EngineReplaceAnimation ( CClientEntity * pEntity, const SString & strInternalBlockName, const SString & strInternalAnimName, const SString & strCustomBlockName, const SString & strCustomAnimName )
+{
+    if ( IS_PED ( pEntity ) )
+    { 
+        CClientPed& Ped = static_cast < CClientPed& > ( *pEntity );
+
+        CAnimBlock * pInternalBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strInternalBlockName );
+        std::shared_ptr < CClientIFP > pCustomIFP = g_pClientGame->GetIFPPointerFromMap ( strCustomBlockName );
+        if ( pInternalBlock && pCustomIFP )
+        {
+            CAnimBlendHierarchy * pInternalAnimHierarchy = g_pGame->GetAnimManager ()->GetAnimation ( strInternalAnimName, pInternalBlock );
+            CAnimBlendHierarchySAInterface * pCustomAnimHierarchyInterface = pCustomIFP->GetAnimationHierarchy ( strCustomAnimName );
+            if ( pInternalAnimHierarchy && pCustomAnimHierarchyInterface )
+            { 
+                Ped.ReplaceAnimation ( pInternalAnimHierarchy, pCustomIFP, pCustomAnimHierarchyInterface );
+                return true;
+            }    
+        }
+    }
+    return false;
+}
+
+bool CIFPEngine::EngineRestoreAnimation ( CClientEntity * pEntity, const SString & strInternalBlockName, const SString & strInternalAnimName, eRestoreAnimation eRestoreType )
+{
+    if ( IS_PED ( pEntity ) )
+    { 
+        CClientPed& Ped = static_cast < CClientPed& > ( *pEntity );
+        
+        if ( eRestoreType == eRestoreAnimation::ALL )
+        {
+            Ped.RestoreAllAnimations ( );
+            return true;
+        }
+        else
+        { 
+            CAnimBlock * pInternalBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strInternalBlockName );
+            if ( pInternalBlock )
+            {
+                if ( eRestoreType == eRestoreAnimation::BLOCK )
+                {
+                    Ped.RestoreAnimations ( *pInternalBlock );
+                    return true;
+                }
+                else 
+                { 
+                    CAnimBlendHierarchy * pInternalAnimHierarchy = g_pGame->GetAnimManager ()->GetAnimation ( strInternalAnimName, pInternalBlock );
+                    if ( pInternalAnimHierarchy )
+                    { 
+                        Ped.RestoreAnimation ( pInternalAnimHierarchy );
+                        return true;
+                    }    
+                }
+            }
+        }
+    }
+    return false;
+}

Client/mods/deathmatch/logic/CIFPEngine.h

@@ -0,0 +1,21 @@
+#pragma
+#ifndef __CIFPENGINE_H
+#define __CIFPENGINE_H
+
+class CIFPEngine
+{
+public:
+    enum eRestoreAnimation
+    {
+        SINGLE,
+        BLOCK,
+        ALL
+    };
+
+    static std::shared_ptr < CClientIFP > EngineLoadIFP           ( CResource * pResource, CClientManager * pManager, const SString & strPath, const SString & strBlockName );
+    static bool                           EngineReplaceAnimation  ( CClientEntity * pEntity, const SString & strInternalBlockName, const SString & strInternalAnimName, const SString & strCustomBlockName, const SString & strCustomAnimName );
+    static bool                           EngineRestoreAnimation  ( CClientEntity * pEntity, const SString & strInternalBlockName, const SString & strInternalAnimName, eRestoreAnimation RestoreType );
+
+};
+
+#endif

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

@@ -305,39 +305,15 @@ int CLuaEngineDefs::EngineLoadIFP ( lua_State* luaVM )
                 // Is this a legal filepath?
                 if ( CResourceManager::ParseResourcePathInput( strFile, pResource, &strPath ) )
                 {
-                    // Grab the resource root entity
-                    CClientEntity* pRoot = pResource->GetResourceIFPRoot ();
-                    
-                    // Check whether the IFP blockname exists or not
-                    if ( g_pClientGame->GetIFPPointerFromMap ( strBlockName ) == nullptr )
-                    { 
-                        // Create a IFP element
-                        std::shared_ptr < CClientIFP > pIFP ( new CClientIFP ( m_pManager, INVALID_ELEMENT_ID ) );
-
-                        // Try to load the IFP file
-                        if ( pIFP->LoadIFP ( strPath, strBlockName ) )
-                        {
-                            // We can use the map to retrieve correct IFP by block name later
-                            g_pClientGame->InsertIFPPointerToMap ( strBlockName, pIFP );
-
-                            // Success loading the file. Set parent to IFP root
-                            pIFP->SetParent ( pRoot );
-
-                            // Return the IFP element
-                            lua_pushelement ( luaVM, pIFP.get ( ) );
-                            return 1;
-                         }
-                        else
-                        {
-                            // Delete it again
-                            //delete pIFP;
-                            argStream.SetCustomError ( strFile, "Error loading IFP" );
-                        }
-                    }
-                    else
+                    std::shared_ptr < CClientIFP > pIFP = CIFPEngine::EngineLoadIFP ( pResource, m_pManager, strPath, strBlockName );
+                    if ( pIFP != nullptr )
                     {
-                        argStream.SetCustomError ( strFile, "Block name already exists" );
+                        // Return the IFP element
+                        lua_pushelement ( luaVM, pIFP.get ( ) );
+                        return 1;
                     }
+                    else
+                        argStream.SetCustomError ( strFile, "Error loading IFP" );
                 }
                 else
                     argStream.SetCustomError ( strFile, "Bad file path" );
@@ -526,27 +502,10 @@ int CLuaEngineDefs::EngineReplaceAnimation ( lua_State* luaVM )
 
     if ( !argStream.HasErrors () )
     {
-        if ( IS_PED ( pEntity ) )
-        { 
-            CClientPed& Ped = static_cast < CClientPed& > ( *pEntity );
-
-            CAnimBlock * pInternalBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strInternalBlockName );
-            std::shared_ptr < CClientIFP > pCustomIFP = g_pClientGame->GetIFPPointerFromMap ( strCustomBlockName );
-            if ( pInternalBlock && pCustomIFP )
-            {
-                CAnimBlendHierarchy * pInternalAnimHierarchy = g_pGame->GetAnimManager ()->GetAnimation ( strInternalAnimName, pInternalBlock );
-                CAnimBlendHierarchySAInterface * pCustomAnimHierarchyInterface = pCustomIFP->GetAnimationHierarchy ( strCustomAnimName );
-                if ( pInternalAnimHierarchy && pCustomAnimHierarchyInterface )
-                { 
-                    Ped.ReplaceAnimation ( pInternalAnimHierarchy, pCustomIFP, pCustomAnimHierarchyInterface );
-                    lua_pushboolean ( luaVM, true );
-                    return 1;
-                }    
-                else
-                    argStream.SetCustomError ( "Incorrect Animation name" ); 
-            }
-            else
-                argStream.SetCustomError ( "Incorrect Block name" );
+        if ( CIFPEngine::EngineReplaceAnimation ( pEntity, strInternalBlockName, strInternalAnimName, strCustomBlockName, strCustomAnimName ) )
+        {
+            lua_pushboolean ( luaVM, true );
+            return 1;
         }
     }
     if ( argStream.HasErrors () )
@@ -560,23 +519,22 @@ int CLuaEngineDefs::EngineReplaceAnimation ( lua_State* luaVM )
 int CLuaEngineDefs::EngineRestoreAnimation ( lua_State* luaVM )
 {
     CClientEntity * pEntity = nullptr;
-    bool bRestoreAllAnimations = false;
-    bool bRestoreBlockAnimations = false;
+    CIFPEngine::eRestoreAnimation eRestoreType = CIFPEngine::eRestoreAnimation::SINGLE;
     SString strInternalBlockName = "";
     SString strInternalAnimName = "";
 
     CScriptArgReader argStream ( luaVM );
     argStream.ReadUserData ( pEntity );
     if ( argStream.NextIsNil ( ) || argStream.NextIsNone ( ) )
     {
-        bRestoreAllAnimations = true;
+        eRestoreType = CIFPEngine::eRestoreAnimation::ALL;
     }
     else 
     { 
         argStream.ReadString ( strInternalBlockName );
         if ( argStream.NextIsNil ( ) || argStream.NextIsNone ( ) )
         { 
-            bRestoreBlockAnimations = true;
+            eRestoreType = CIFPEngine::eRestoreAnimation::BLOCK;
         }
         else
         {
@@ -586,44 +544,10 @@ int CLuaEngineDefs::EngineRestoreAnimation ( lua_State* luaVM )
 
     if ( !argStream.HasErrors () )
     {
-        if ( IS_PED ( pEntity ) )
-        { 
-            CClientEntity & Entity = *pEntity;
-            CClientPed& Ped = static_cast < CClientPed& > ( Entity );
-        
-            if ( bRestoreAllAnimations )
-            {
-                Ped.RestoreAllAnimations ( );
-                lua_pushboolean ( luaVM, true );
-                return 1;
-            }
-            else
-            { 
-                CAnimBlock * pInternalBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strInternalBlockName );
-                if ( pInternalBlock )
-                {
-                    if ( bRestoreBlockAnimations )
-                    {
-                        Ped.RestoreAnimations ( *pInternalBlock );
-                        lua_pushboolean ( luaVM, true );
-                        return 1;
-                    }
-                    else 
-                    { 
-                        CAnimBlendHierarchy * pInternalAnimHierarchy = g_pGame->GetAnimManager ()->GetAnimation ( strInternalAnimName, pInternalBlock );
-                        if ( pInternalAnimHierarchy )
-                        { 
-                            Ped.RestoreAnimation ( pInternalAnimHierarchy );
-                            lua_pushboolean ( luaVM, true );
-                            return 1;
-                        }    
-                        else
-                            argStream.SetCustomError ( "Incorrect Animation name" ); 
-                    }
-                }
-                else
-                    argStream.SetCustomError ( "Incorrect Block name" );
-            }
+        if ( CIFPEngine::EngineRestoreAnimation ( pEntity, strInternalBlockName, strInternalAnimName, eRestoreType ) )
+        {
+            lua_pushboolean ( luaVM, true );
+            return 1;
         }
     }
     if ( argStream.HasErrors () )