Removed isIFPLoaded checks

codenulls · codenulls · commit 7b2394cfff8b · 2018-03-26T10:02:19.000+05:00
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -4050,15 +4050,12 @@ bool CClientGame::AssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSA
         auto pReplacedAnimation = pClientPed->getReplacedAnimation ( pOriginalAnimStaticAssoc->pAnimHeirarchy );
         if ( pReplacedAnimation != nullptr )
         {   
-            if ( pReplacedAnimation->pIFP->isIFPLoaded ( ) )
-            { 
-                std::shared_ptr < CIFPAnimations > pIFPAnimations = pReplacedAnimation->pIFP->GetIFPAnimationsPointer ();
-                InsertAnimationAssociationToMap ( pAnimAssoc, pIFPAnimations );
+            std::shared_ptr < CIFPAnimations > pIFPAnimations = pReplacedAnimation->pIFP->GetIFPAnimationsPointer ();
+            InsertAnimationAssociationToMap ( pAnimAssoc, pIFPAnimations );
                
-                // Play our custom animation instead of default
-                CAnimBlendStaticAssociation_Init ( pOutAnimStaticAssoc, pClump, pReplacedAnimation->pAnimationHierarchy );
-                isCustomAnimationToPlay = true;
-            }
+            // Play our custom animation instead of default
+            CAnimBlendStaticAssociation_Init ( pOutAnimStaticAssoc, pClump, pReplacedAnimation->pAnimationHierarchy );
+            isCustomAnimationToPlay = true;
         }
     }
 
@@ -4100,18 +4097,15 @@ bool CClientGame::BlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterf
                 auto pCustomAnimBlendHierarchy   = pIFP->GetAnimationHierarchy ( strAnimationName );
                 if ( pCustomAnimBlendHierarchy != nullptr )
                 { 
-                    if ( pIFP->isIFPLoaded ( ) )
-                    { 
-                        std::shared_ptr < CIFPAnimations > pIFPAnimations = pIFP->GetIFPAnimationsPointer ();
-                        InsertAnimationAssociationToMap ( pAnimAssoc, pIFPAnimations );
+                    std::shared_ptr < CIFPAnimations > pIFPAnimations = pIFP->GetIFPAnimationsPointer ();
+                    InsertAnimationAssociationToMap ( pAnimAssoc, pIFPAnimations );
 
-                        pClientPed->setCurrentAnimationCustom ( true );
-                        pClientPed->setNextAnimationNormal ( );
+                    pClientPed->setCurrentAnimationCustom ( true );
+                    pClientPed->setNextAnimationNormal ( );
 
-                        *pOutAnimHierarchy = pCustomAnimBlendHierarchy;
-                        isCustomAnimationToPlay = true;
-                        return isCustomAnimationToPlay;
-                    }
+                    *pOutAnimHierarchy = pCustomAnimBlendHierarchy;
+                    isCustomAnimationToPlay = true;
+                    return isCustomAnimationToPlay;
                 }   
                 else
                 {
diff --git a/Client/mods/deathmatch/logic/CClientIFP.cpp b/Client/mods/deathmatch/logic/CClientIFP.cpp
@@ -23,49 +23,25 @@ CClientIFP::CClientIFP ( class CClientManager* pManager, ElementID ID ) : CClien
     // Init
     m_pManager = pManager;
     SetTypeName ( "IFP" );
-    m_bisIFPLoaded = false;
-    //m_pIFPAnimations = nullptr;
-     m_pIFPAnimations = std::make_shared < CIFPAnimations > ();
+    m_pIFPAnimations = std::make_shared < CIFPAnimations > ();
 }
 
 CClientIFP::~CClientIFP ( void )
 {
-    UnloadIFP ( );
 }
 
 bool CClientIFP::LoadIFP ( const char* szFilePath, SString strBlockName )
 {
     printf ("\nCClientIFP::LoadIFP: szFilePath %s\n szBlockName: %s\n\n", szFilePath, strBlockName.c_str());
     
     m_strBlockName = strBlockName;
-    //m_pIFPAnimations ( new CIFPAnimations () );
     m_pVecAnimations = &m_pIFPAnimations->vecAnimations;
 
     if ( LoadIFPFile ( szFilePath ) )
     {
-        m_bisIFPLoaded = true;
-    }
-    return m_bisIFPLoaded;
-}
-
-void CClientIFP::UnloadIFP ( void )
-{
-    if ( m_bisIFPLoaded )
-    { 
-        printf ("CClientIFP::UnloadIFP ( ) called!\n");
-
-        m_bisIFPLoaded = false;
-/*
-        // When all animations from this IFP block stop playing, and 
-        // the reference count reaches zero, IFP animations will be unloaded
-        m_pIFPAnimations->bUnloadOnZeroReferences = true;
-        
-        // unload IFP animations, if reference count is zero
-        if ( m_pIFPAnimations->iReferences == 0 )
-        { 
-            g_pClientGame->DeleteIFPAnimations ( m_pIFPAnimations ); 
-        }*/
+        return true;
     }
+    return false;
 }
 
 bool CClientIFP::LoadIFPFile(const char * FilePath)
@@ -1113,20 +1089,14 @@ std::string CClientIFP::getCorrectBoneNameFromName(std::string const& BoneName)
 
 CAnimBlendHierarchySAInterface * CClientIFP::GetAnimationHierarchy ( const SString & strAnimationName )
 {
-    CAnimBlendHierarchySAInterface * pAnimHierarchyInterface = nullptr;
-
-    for (auto it = m_pVecAnimations->begin(); it != m_pVecAnimations->end(); ++it) 
+    for ( auto it = m_pVecAnimations->begin(); it != m_pVecAnimations->end(); ++it ) 
     {
         if (strAnimationName.ToLower() == it->Name.ToLower())
         {
-            if ( m_bisIFPLoaded )
-            { 
-                pAnimHierarchyInterface = (CAnimBlendHierarchySAInterface *)&it->Hierarchy;
-            }
-            break;
+            return (CAnimBlendHierarchySAInterface *)&it->Hierarchy;
         }
     }
-    return pAnimHierarchyInterface;
+    return nullptr;
 }
 
 // ----------------------------------------------------------------------------------------------------------
diff --git a/Client/mods/deathmatch/logic/CClientIFP.h b/Client/mods/deathmatch/logic/CClientIFP.h
@@ -17,9 +17,7 @@ class CClientIFP: public CClientEntity, FileLoader
     virtual eClientEntityType       GetType                 ( void ) const              { return CCLIENTIFP; }
 
     const SString &                 GetBlockName            ( void ) { return m_strBlockName; }
-    bool                            isIFPLoaded             ( void ) { return m_bisIFPLoaded; }
     bool                            LoadIFP                 ( const char* szFilePath, SString strBlockName );
-    void                            UnloadIFP               ( void );
 
     bool                            LoadIFPFile(const char * FilePath);
     void                            ReadIFPVersion1();
@@ -50,12 +48,10 @@ class CClientIFP: public CClientEntity, FileLoader
    
 private:
     std::shared_ptr < CIFPAnimations > m_pIFPAnimations;
-    SString                         m_strBlockName;
-    std::vector < IFP_Animation > * m_pVecAnimations;
-    std::vector < unsigned char * > m_DummySequencesKeyFrames;
-    bool                            isVersion1;
-    IFPHeaderV2                     HeaderV2;
-    bool                            m_bisIFPLoaded;
+    SString                            m_strBlockName;
+    std::vector < IFP_Animation > *    m_pVecAnimations;
+    bool                               isVersion1;
+    IFPHeaderV2                        HeaderV2;
 
 };
 
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp
@@ -6191,18 +6191,13 @@ CAnimBlendAssociation * CClientPed::GetFirstAnimation ( void )
     return NULL;
 }
 
-bool CClientPed::ReplaceAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy, const std::shared_ptr < CClientIFP > & pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy )
+void CClientPed::ReplaceAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy, const std::shared_ptr < CClientIFP > & pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy )
 {
-    if ( pIFP->isIFPLoaded ( ) )
-    {
-        SReplacedAnimation replacedAnimation;
-        replacedAnimation.pIFP = pIFP;
-        replacedAnimation.pAnimationHierarchy = pCustomAnimHierarchy;
+    SReplacedAnimation replacedAnimation;
+    replacedAnimation.pIFP = pIFP;
+    replacedAnimation.pAnimationHierarchy = pCustomAnimHierarchy;
 
-        m_mapOfReplacedAnimations [ pInternalAnimHierarchy->GetInterface () ] = replacedAnimation;
-        return true;
-    }
-    return false;
+    m_mapOfReplacedAnimations [ pInternalAnimHierarchy->GetInterface () ] = replacedAnimation;
 }
 
 void CClientPed::RestoreAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy )
diff --git a/Client/mods/deathmatch/logic/CClientPed.h b/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; }
 
-    bool                        ReplaceAnimation        ( CAnimBlendHierarchy * pInternalAnimHierarchy, const std::shared_ptr < CClientIFP > & pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy );
+    void                        ReplaceAnimation        ( CAnimBlendHierarchy * pInternalAnimHierarchy, const std::shared_ptr < CClientIFP > & pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy );
     void                        RestoreAnimation        ( CAnimBlendHierarchy * pInternalAnimHierarchy );
     void                        RestoreAnimations       ( const std::shared_ptr < CClientIFP > & IFP );
     void                        RestoreAnimations       ( CAnimBlock & animationBlock );
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
@@ -538,11 +538,9 @@ int CLuaEngineDefs::EngineReplaceAnimation ( lua_State* luaVM )
                 CAnimBlendHierarchySAInterface * pCustomAnimHierarchyInterface = pCustomIFP->GetAnimationHierarchy ( strCustomAnimName );
                 if ( pInternalAnimHierarchy && pCustomAnimHierarchyInterface )
                 { 
-                    if ( Ped.ReplaceAnimation ( pInternalAnimHierarchy, pCustomIFP, pCustomAnimHierarchyInterface ) )
-                    { 
-                        lua_pushboolean ( luaVM, true );
-                        return 1;
-                    }
+                    Ped.ReplaceAnimation ( pInternalAnimHierarchy, pCustomIFP, pCustomAnimHierarchyInterface );
+                    lua_pushboolean ( luaVM, true );
+                    return 1;
                 }    
                 else
                     argStream.SetCustomError ( "Incorrect Animation name" ); 

Original file line number	Diff line number	Diff line change
`@@ -23,49 +23,25 @@ CClientIFP::CClientIFP ( class CClientManager* pManager, ElementID ID ) : CClien`
`23`	`23`	`// Init`
`24`	`24`	`m_pManager = pManager;`
`25`	`25`	`SetTypeName ( "IFP" );`
`26`		`- m_bisIFPLoaded = false;`
`27`		`- //m_pIFPAnimations = nullptr;`
`28`		`- m_pIFPAnimations = std::make_shared < CIFPAnimations > ();`
	`26`	`+ m_pIFPAnimations = std::make_shared < CIFPAnimations > ();`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`CClientIFP::~CClientIFP ( void )`
`32`	`30`	`{`
`33`		`- UnloadIFP ( );`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`bool CClientIFP::LoadIFP ( const char* szFilePath, SString strBlockName )`
`37`	`34`	`{`
`38`	`35`	`printf ("\nCClientIFP::LoadIFP: szFilePath %s\n szBlockName: %s\n\n", szFilePath, strBlockName.c_str());`
`39`	`36`
`40`	`37`	`m_strBlockName = strBlockName;`
`41`		`- //m_pIFPAnimations ( new CIFPAnimations () );`
`42`	`38`	`m_pVecAnimations = &m_pIFPAnimations->vecAnimations;`
`43`	`39`
`44`	`40`	`if ( LoadIFPFile ( szFilePath ) )`
`45`	`41`	`{`
`46`		`- m_bisIFPLoaded = true;`
`47`		`- }`
`48`		`- return m_bisIFPLoaded;`
`49`		`-}`
`50`		`-`
`51`		`-void CClientIFP::UnloadIFP ( void )`
`52`		`-{`
`53`		`- if ( m_bisIFPLoaded )`
`54`		`- {`
`55`		`- printf ("CClientIFP::UnloadIFP ( ) called!\n");`
`56`		`-`
`57`		`- m_bisIFPLoaded = false;`
`58`		`-/*`
`59`		`- // When all animations from this IFP block stop playing, and`
`60`		`- // the reference count reaches zero, IFP animations will be unloaded`
`61`		`- m_pIFPAnimations->bUnloadOnZeroReferences = true;`
`62`		`-`
`63`		`- // unload IFP animations, if reference count is zero`
`64`		`- if ( m_pIFPAnimations->iReferences == 0 )`
`65`		`- {`
`66`		`- g_pClientGame->DeleteIFPAnimations ( m_pIFPAnimations );`
`67`		`- }*/`
	`42`	`+ return true;`
`68`	`43`	`}`
	`44`	`+ return false;`
`69`	`45`	`}`
`70`	`46`
`71`	`47`	`bool CClientIFP::LoadIFPFile(const char * FilePath)`
`@@ -1113,20 +1089,14 @@ std::string CClientIFP::getCorrectBoneNameFromName(std::string const& BoneName)`
`1113`	`1089`
`1114`	`1090`	`CAnimBlendHierarchySAInterface * CClientIFP::GetAnimationHierarchy ( const SString & strAnimationName )`
`1115`	`1091`	`{`
`1116`		`- CAnimBlendHierarchySAInterface * pAnimHierarchyInterface = nullptr;`
`1117`		`-`
`1118`		`- for (auto it = m_pVecAnimations->begin(); it != m_pVecAnimations->end(); ++it)`
	`1092`	`+ for ( auto it = m_pVecAnimations->begin(); it != m_pVecAnimations->end(); ++it )`
`1119`	`1093`	`{`
`1120`	`1094`	`if (strAnimationName.ToLower() == it->Name.ToLower())`
`1121`	`1095`	`{`
`1122`		`- if ( m_bisIFPLoaded )`
`1123`		`- {`
`1124`		`- pAnimHierarchyInterface = (CAnimBlendHierarchySAInterface *)&it->Hierarchy;`
`1125`		`- }`
`1126`		`- break;`
	`1096`	`+ return (CAnimBlendHierarchySAInterface *)&it->Hierarchy;`
`1127`	`1097`	`}`
`1128`	`1098`	`}`
`1129`		`- return pAnimHierarchyInterface;`
	`1099`	`+ return nullptr;`
`1130`	`1100`	`}`
`1131`	`1101`
`1132`	`1102`	`// ----------------------------------------------------------------------------------------------------------`