Skip to content

Fixes #4241 #4250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixes #4241 #4250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Client/mods/deathmatch/logic/CClientModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,17 @@ bool CClientModel::Allocate(ushort usParentID)
pModelInfo->MakePedModel("PSYCHO");
return true;
case eClientModelType::OBJECT:
if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
!CClientPedManager::IsValidWeaponModel(usParentID))
{
pModelInfo->MakeObjectModel(usParentID);
return true;
}
break;
case eClientModelType::OBJECT_DAMAGEABLE:
{
bool isValidModel = g_pClientGame->GetObjectManager()->IsValidModel(usParentID);
bool isValidModel = g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
!CClientPedManager::IsValidWeaponModel(usParentID);
bool isDamagable = pParentModelInfo->IsDamageableAtomic();
if (isValidModel && isDamagable)
{
Expand All @@ -63,14 +65,16 @@ bool CClientModel::Allocate(ushort usParentID)
break;
}
case eClientModelType::CLUMP:
if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
!CClientPedManager::IsValidWeaponModel(usParentID))
{
pModelInfo->MakeClumpModel(usParentID);
return true;
}
break;
case eClientModelType::TIMED_OBJECT:
if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID))
if (g_pClientGame->GetObjectManager()->IsValidModel(usParentID) &&
!CClientPedManager::IsValidWeaponModel(usParentID))
{
pModelInfo->MakeTimedObjectModel(usParentID);
return true;
Expand Down
Loading