@@ -508,7 +508,7 @@ class CClientGame
508
508
static CAnimBlendAssociationSAInterface * StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
509
509
static CAnimBlendAssociationSAInterface * StaticAddAnimationAndSyncHandler ( RpClump * pClump, CAnimBlendAssociationSAInterface * pAnimAssocToSyncWith, AssocGroupId animGroup, AnimationId animID );
510
510
static bool StaticAssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSAInterface * pOutAnimStaticAssoc, CAnimBlendAssociationSAInterface * pAnimAssoc, RpClump * pClump, CAnimBlendAssocGroupSAInterface * pAnimAssocGroup, AnimationId animID );
511
- static bool StaticBlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterface * pAnimAssoc, CAnimBlendHierarchySAInterface ** pOutAnimHierarchy, RpClump * pClump );
511
+ static bool StaticBlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterface * pAnimAssoc, CAnimBlendHierarchySAInterface ** pOutAnimHierarchy, int * pFlags, RpClump * pClump );
512
512
static bool StaticProcessCollisionHandler ( CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface );
513
513
static bool StaticVehicleCollisionHandler ( CVehicleSAInterface* pThisInterface, CEntitySAInterface* pOtherInterface, int iModelIndex, float fDamageImpulseMag , float fCollidingDamageImpulseMag , uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity );
514
514
static bool StaticVehicleDamageHandler ( CEntitySAInterface* pVehicleInterface, float fLoss , CEntitySAInterface* pAttackerInterface, eWeaponType weaponType, const CVector& vecDamagePos, uchar ucTyre );
@@ -542,7 +542,7 @@ class CClientGame
542
542
CAnimBlendAssociationSAInterface * AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
543
543
CAnimBlendAssociationSAInterface * AddAnimationAndSyncHandler ( RpClump * pClump, CAnimBlendAssociationSAInterface * pAnimAssocToSyncWith, AssocGroupId animGroup, AnimationId animID );
544
544
bool AssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSAInterface * pOutAnimStaticAssoc, CAnimBlendAssociationSAInterface * pAnimAssoc, RpClump * pClump, CAnimBlendAssocGroupSAInterface * pAnimAssocGroup, AnimationId animID );
545
- bool BlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterface * pAnimAssoc, CAnimBlendHierarchySAInterface ** pOutAnimHierarchy, RpClump * pClump );
545
+ bool BlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterface * pAnimAssoc, CAnimBlendHierarchySAInterface ** pOutAnimHierarchy, int * pFlags, RpClump * pClump );
546
546
bool ProcessCollisionHandler ( CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface );
547
547
bool VehicleCollisionHandler ( CVehicleSAInterface* pCollidingVehicle, CEntitySAInterface* pCollidedVehicle, int iModelIndex, float fDamageImpulseMag , float fCollidingDamageImpulseMag , uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity );
548
548
bool VehicleDamageHandler ( CEntitySAInterface* pVehicleInterface, float fLoss , CEntitySAInterface* pAttackerInterface, eWeaponType weaponType, const CVector& vecDamagePos, uchar ucTyre );
@@ -593,12 +593,12 @@ class CClientGame
593
593
void SetFileCacheRoot ( void );
594
594
const char * GetFileCacheRoot ( void ) { return m_strFileCacheRoot; }
595
595
596
- void InsertIFPPointerToMap ( const SString & strBlockName , const std::shared_ptr < CClientIFP > & pIFP );
597
- void RemoveIFPPointerFromMap ( const SString & strBlockName );
598
- std::shared_ptr < CClientIFP > GetIFPPointerFromMap ( const SString & strBlockName );
596
+ inline void InsertIFPPointerToMap ( const unsigned int u32BlockNameHash , const std::shared_ptr < CClientIFP > & pIFP ) { m_mapOfIfpPointers [ u32BlockNameHash ] = pIFP; }
597
+ inline void RemoveIFPPointerFromMap ( const unsigned int u32BlockNameHash ) { m_mapOfIfpPointers. erase ( u32BlockNameHash ); }
598
+ std::shared_ptr < CClientIFP > GetIFPPointerFromMap ( const unsigned int u32BlockNameHash );
599
599
600
- void InsertPedPointerToMap ( CClientPed * pPed );
601
- void RemovePedPointerFromMap ( CClientPed * pPed );
600
+ void InsertPedPointerToMap ( CClientPed * pPed ) { m_mapOfPedPointers [ pPed ] = true ; }
601
+ void RemovePedPointerFromMap ( CClientPed * pPed ) { m_mapOfPedPointers. erase ( pPed ); }
602
602
CClientPed * GetClientPedByClump ( const RpClump & Clump );
603
603
604
604
void OnClientIFPUnload ( const std::shared_ptr < CClientIFP > & IFP );
@@ -819,8 +819,8 @@ class CClientGame
819
819
820
820
SharedUtil::CAsyncTaskScheduler* m_pAsyncTaskScheduler;
821
821
822
- // (SString ) Key is custom block name that is supplied to engineLoadIFP
823
- std::map < SString , std::shared_ptr < CClientIFP > > m_mapOfIfpPointers;
822
+ // (unsigned int ) Key is the hash of custom block name that is supplied to engineLoadIFP
823
+ std::map < unsigned int , std::shared_ptr < CClientIFP > > m_mapOfIfpPointers;
824
824
825
825
std::map < CClientPed *, bool > m_mapOfPedPointers;
826
826
AnimAssociations_type m_mapOfCustomAnimationAssociations;
0 commit comments