fixed GetAnimAssociation function and renamed it to GetAnimstaticAssociation, also implemented isGateWayAnimationHierarchy

codenulls · codenulls · commit 098da77e70bf · 2018-03-03T00:19:47.000+05:00
diff --git a/Client/game_sa/CAnimManagerSA.cpp b/Client/game_sa/CAnimManagerSA.cpp
@@ -256,9 +256,9 @@ CAnimBlendAssociation * CAnimManagerSA::CreateAnimAssociation ( AssocGroupId ani
 }
 
 
-CAnimBlendAssociation * CAnimManagerSA::GetAnimAssociation ( AssocGroupId animGroup, AnimationId animID )
+CAnimBlendStaticAssociationSAInterface * CAnimManagerSA::GetAnimStaticAssociation ( AssocGroupId animGroup, AnimationId animID )
 {
-    CAnimBlendAssociationSAInterface * pInterface;
+    CAnimBlendStaticAssociationSAInterface * pInterface;
     DWORD dwFunc = FUNC_CAnimManager_GetAnimAssociation;
     _asm
     {
@@ -268,7 +268,7 @@ CAnimBlendAssociation * CAnimManagerSA::GetAnimAssociation ( AssocGroupId animGr
         mov     pInterface, eax
         add     esp, 0x8
     }
-    return GetAnimBlendAssociation ( pInterface );
+    return pInterface;
 }
 
 
@@ -760,6 +760,11 @@ CAnimBlendHierarchy * CAnimManagerSA::GetAnimBlendHierarchy ( CAnimBlendHierarch
     }
     return NULL;
 }
+ 
+bool CAnimManagerSA::isGateWayAnimationHierarchy ( CAnimBlendHierarchySAInterface * pInterface )
+{
+    return pGame->GetKeyGen()->GetUppercaseKey ( GATEWAY_ANIMATION_NAME.c_str ( ) ) == pInterface->iHashKey;
+}
 
 void CAnimManagerSA::InsertPedClumpToMap ( RpClump * pClump, CClientPed * pClientPed )
 {

Original file line number	Diff line number	Diff line change
`@@ -256,9 +256,9 @@ CAnimBlendAssociation * CAnimManagerSA::CreateAnimAssociation ( AssocGroupId ani`
`256`	`256`	`}`
`257`	`257`
`258`	`258`
`259`		`-CAnimBlendAssociation * CAnimManagerSA::GetAnimAssociation ( AssocGroupId animGroup, AnimationId animID )`
	`259`	`+CAnimBlendStaticAssociationSAInterface * CAnimManagerSA::GetAnimStaticAssociation ( AssocGroupId animGroup, AnimationId animID )`
`260`	`260`	`{`
`261`		`- CAnimBlendAssociationSAInterface * pInterface;`
	`261`	`+ CAnimBlendStaticAssociationSAInterface * pInterface;`
`262`	`262`	`DWORD dwFunc = FUNC_CAnimManager_GetAnimAssociation;`
`263`	`263`	`_asm`
`264`	`264`	`{`
`@@ -268,7 +268,7 @@ CAnimBlendAssociation * CAnimManagerSA::GetAnimAssociation ( AssocGroupId animGr`
`268`	`268`	`mov pInterface, eax`
`269`	`269`	`add esp, 0x8`
`270`	`270`	`}`
`271`		`- return GetAnimBlendAssociation ( pInterface );`
	`271`	`+ return pInterface;`
`272`	`272`	`}`
`273`	`273`
`274`	`274`
`@@ -760,6 +760,11 @@ CAnimBlendHierarchy * CAnimManagerSA::GetAnimBlendHierarchy ( CAnimBlendHierarch`
`760`	`760`	`}`
`761`	`761`	`return NULL;`
`762`	`762`	`}`
	`763`	`+`
	`764`	`+bool CAnimManagerSA::isGateWayAnimationHierarchy ( CAnimBlendHierarchySAInterface * pInterface )`
	`765`	`+{`
	`766`	`+ return pGame->GetKeyGen()->GetUppercaseKey ( GATEWAY_ANIMATION_NAME.c_str ( ) ) == pInterface->iHashKey;`
	`767`	`+}`
`763`	`768`
`764`	`769`	`void CAnimManagerSA::InsertPedClumpToMap ( RpClump * pClump, CClientPed * pClientPed )`
`765`	`770`	`{`