@@ -45,15 +45,17 @@ bool CClientModel::Allocate(ushort usParentID)
4545 pModelInfo->MakePedModel (" PSYCHO" );
4646 return true ;
4747 case eClientModelType::OBJECT:
48- if (g_pClientGame->GetObjectManager ()->IsValidModel (usParentID))
48+ if (g_pClientGame->GetObjectManager ()->IsValidModel (usParentID) &&
49+ !CClientPedManager::IsValidWeaponModel (usParentID))
4950 {
5051 pModelInfo->MakeObjectModel (usParentID);
5152 return true ;
5253 }
5354 break ;
5455 case eClientModelType::OBJECT_DAMAGEABLE:
5556 {
56- bool isValidModel = g_pClientGame->GetObjectManager ()->IsValidModel (usParentID);
57+ bool isValidModel = g_pClientGame->GetObjectManager ()->IsValidModel (usParentID) &&
58+ !CClientPedManager::IsValidWeaponModel (usParentID);
5759 bool isDamagable = pParentModelInfo->IsDamageableAtomic ();
5860 if (isValidModel && isDamagable)
5961 {
@@ -63,14 +65,16 @@ bool CClientModel::Allocate(ushort usParentID)
6365 break ;
6466 }
6567 case eClientModelType::CLUMP:
66- if (g_pClientGame->GetObjectManager ()->IsValidModel (usParentID))
68+ if (g_pClientGame->GetObjectManager ()->IsValidModel (usParentID) &&
69+ !CClientPedManager::IsValidWeaponModel (usParentID))
6770 {
6871 pModelInfo->MakeClumpModel (usParentID);
6972 return true ;
7073 }
7174 break ;
7275 case eClientModelType::TIMED_OBJECT:
73- if (g_pClientGame->GetObjectManager ()->IsValidModel (usParentID))
76+ if (g_pClientGame->GetObjectManager ()->IsValidModel (usParentID) &&
77+ !CClientPedManager::IsValidWeaponModel (usParentID))
7478 {
7579 pModelInfo->MakeTimedObjectModel (usParentID);
7680 return true ;
0 commit comments