Animation name is now checked in engineLoadIFP whether the hierarchy exists or not

codenulls · codenulls · commit b0157a809154 · 2018-03-08T15:57:07.000+05:00
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -2142,8 +2142,9 @@ bool CStaticFunctionDefinitions::SetPedAnimation ( CClientEntity& Entity, const
                 {   
                     // Play the gateway animation
                     const SString & strGateWayBlockName = g_pGame->GetAnimManager()->GetGateWayBlockName ( );
-                    CAnimBlock    * pBlock              = g_pGame->GetAnimManager ()->GetAnimationBlock ( strGateWayBlockName );
-                    if ( pBlock )
+                    CAnimBlock * pBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strGateWayBlockName );
+                    auto pCustomAnimBlendHierarchy = pIFP->GetAnimationHierarchy ( szAnimName );
+                    if ( ( pBlock ) && ( pCustomAnimBlendHierarchy != nullptr ) )
                     {
                         Ped.setNextAnimationCustom ( szBlockName,  szAnimName );
 

Original file line number	Diff line number	Diff line change
`@@ -2142,8 +2142,9 @@ bool CStaticFunctionDefinitions::SetPedAnimation ( CClientEntity& Entity, const`
`2142`	`2142`	`{`
`2143`	`2143`	`// Play the gateway animation`
`2144`	`2144`	`const SString & strGateWayBlockName = g_pGame->GetAnimManager()->GetGateWayBlockName ( );`
`2145`		`- CAnimBlock * pBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strGateWayBlockName );`
`2146`		`- if ( pBlock )`
	`2145`	`+ CAnimBlock * pBlock = g_pGame->GetAnimManager ()->GetAnimationBlock ( strGateWayBlockName );`
	`2146`	`+ auto pCustomAnimBlendHierarchy = pIFP->GetAnimationHierarchy ( szAnimName );`
	`2147`	`+ if ( ( pBlock ) && ( pCustomAnimBlendHierarchy != nullptr ) )`
`2147`	`2148`	`{`
`2148`	`2149`	`Ped.setNextAnimationCustom ( szBlockName, szAnimName );`
`2149`	`2150`