H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-07-15 22:09:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge f834704bc2 into ed8209cc35

Browse Source
This commit is contained in:
wjxggg 2025-11-25 15:13:05 +02:00 committed by GitHub
commit 342c31af94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/client/c_baseanimating.cpp
View File

@ -4981,9 +4981,10 @@ bool C_BaseAnimating::TestHitboxes( const Ray_t &ray, unsigned int fContentsMask
VPhysicsSetObject( pReplace );
}
}
return true;
}
return true;
return false;
}

3
game/server/baseanimating.cpp
View File

@ -2693,8 +2693,9 @@ bool CBaseAnimating::TestHitboxes( const Ray_t &ray, unsigned int fContentsMask,
tr.surface.name = "**studio**";
tr.surface.flags = SURF_HITBOX;
tr.surface.surfaceProps = physprops->GetSurfaceIndex( pBone->pszSurfaceProp() );
return true;
}
return true;
return false;
}
void CBaseAnimating::InitBoneControllers ( void ) // FIXME: rename

8
game/server/props.cpp
View File

@ -6071,18 +6071,18 @@ bool UTIL_CreateScaledPhysObject( CBaseAnimating *pInstance, float flScale )
pInstance->VPhysicsDestroyObject();
pInstance->VPhysicsSetObject( pNewObject );
// Scale the base model as well
pInstance->SetModelScale( flScale );
// Increase our model bounds
const model_t *pModel = modelinfo->GetModel( pInstance->GetModelIndex() );
if ( pModel )
{
Vector mins, maxs;
modelinfo->GetModelBounds( pModel, mins, maxs );
pInstance->SetCollisionBounds( mins*flScale, maxs*flScale );
pInstance->SetCollisionBounds( mins, maxs );
}
// Scale the base model as well
pInstance->SetModelScale( flScale );
if ( pInstance->GetParent() )
{
pNewObject->SetShadow( 1e4, 1e4, false, false );