d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-02-05 03:34:15 +00:00
Code Issues Projects Releases Wiki Activity

revert me after

Browse Source
This commit is contained in:
nillerusr 2023-10-16 07:54:56 +03:00
parent 5a4d0b7a4d
commit ee6a6d0b37
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/server/ai_basenpc.cpp
View File

@ -6586,7 +6586,7 @@ void CAI_BaseNPC::SetupVPhysicsHull()
#endif #endif
IPhysicsShadowController *pController = pPhysObj->GetShadowController(); IPhysicsShadowController *pController = pPhysObj->GetShadowController();
float avgsize = (WorldAlignSize().x + WorldAlignSize().y) * 0.5; float avgsize = (WorldAlignSize().x + WorldAlignSize().y) * 0.5;
pController->SetTeleportDistance( avgsize * 0.5 ); //pController->SetTeleportDistance( avgsize * 0.5 );
m_bCheckContacts = true; m_bCheckContacts = true;
} }
} }
@ -6598,6 +6598,8 @@ void CAI_BaseNPC::SetupVPhysicsHull()
ConVar ai_auto_contact_solver( "ai_auto_contact_solver", "1" ); ConVar ai_auto_contact_solver( "ai_auto_contact_solver", "1" );
void CAI_BaseNPC::CheckPhysicsContacts() void CAI_BaseNPC::CheckPhysicsContacts()
{ {
return;
if ( gpGlobals->frametime <= 0.0f || !ai_auto_contact_solver.GetBool() ) if ( gpGlobals->frametime <= 0.0f || !ai_auto_contact_solver.GetBool() )
return; return;
@ -6616,6 +6618,8 @@ void CAI_BaseNPC::CheckPhysicsContacts()
while ( pSnapshot->IsValid() ) while ( pSnapshot->IsValid() )
{ {
IPhysicsObject *pOther = pSnapshot->GetObject(1); IPhysicsObject *pOther = pSnapshot->GetObject(1);
if( !pOther )
continue;
pOtherEntity = static_cast<CBaseEntity *>(pOther->GetGameData()); pOtherEntity = static_cast<CBaseEntity *>(pOther->GetGameData());
if ( pOtherEntity && pGroundEntity != pOtherEntity ) if ( pOtherEntity && pGroundEntity != pOtherEntity )

6
game/shared/physics_shared.cpp
View File

@ -603,7 +603,7 @@ IPhysicsObject *PhysCreateWorld_Shared( CBaseEntity *pWorld, vcollide_t *pWorldC
pWorldCollide->solids[0], surfaceData, vec3_origin, vec3_angle, &params ); pWorldCollide->solids[0], surfaceData, vec3_origin, vec3_angle, &params );
// hint - saves vphysics some work // hint - saves vphysics some work
pWorldPhysics->SetCallbackFlags( pWorldPhysics->GetCallbackFlags() | CALLBACK_NEVER_DELETED ); //pWorldPhysics->SetCallbackFlags( pWorldPhysics->GetCallbackFlags() | CALLBACK_NEVER_DELETED );
//PhysCheckAdd( world, "World" ); //PhysCheckAdd( world, "World" );
// walk the world keys in case there are some fluid volumes to create // walk the world keys in case there are some fluid volumes to create
@ -667,8 +667,8 @@ IPhysicsObject *PhysCreateWorld_Shared( CBaseEntity *pWorld, vcollide_t *pWorldC
IPhysicsObject *pWater = physenv->CreatePolyObjectStatic( pWorldCollide->solids[fluid.index], IPhysicsObject *pWater = physenv->CreatePolyObjectStatic( pWorldCollide->solids[fluid.index],
surfaceData, vec3_origin, vec3_angle, &solid.params ); surfaceData, vec3_origin, vec3_angle, &solid.params );
pWater->SetCallbackFlags( pWater->GetCallbackFlags() | CALLBACK_NEVER_DELETED ); //pWater->SetCallbackFlags( pWater->GetCallbackFlags() | CALLBACK_NEVER_DELETED );
physenv->CreateFluidController( pWater, &fluid.params ); //physenv->CreateFluidController( pWater, &fluid.params );
} }
} }
else if ( !strcmpi( pBlock, "materialtable" ) ) else if ( !strcmpi( pBlock, "materialtable" ) )

2
game/shared/physics_shared.h
View File

@ -100,6 +100,8 @@ void PhysFrictionEffect( Vector &vecPos, Vector vecVel, float energy, int surfac
// ORs gameFlags with the physics object's current game flags // ORs gameFlags with the physics object's current game flags
inline unsigned short PhysSetGameFlags( IPhysicsObject *pPhys, unsigned short gameFlags ) inline unsigned short PhysSetGameFlags( IPhysicsObject *pPhys, unsigned short gameFlags )
{ {
return 0;
unsigned short flags = pPhys->GetGameFlags(); unsigned short flags = pPhys->GetGameFlags();
flags |= gameFlags; flags |= gameFlags;
pPhys->SetGameFlags( flags ); pPhys->SetGameFlags( flags );

2
game/shared/ragdoll_shared.cpp
View File

@ -269,6 +269,8 @@ static void RagdollCreateObjects( IPhysicsEnvironment *pPhysEnv, ragdoll_t &ragd
memset( ragdoll.list, 0, sizeof(ragdoll.list) ); memset( ragdoll.list, 0, sizeof(ragdoll.list) );
memset( &ragdoll.animfriction, 0, sizeof(ragdoll.animfriction) ); memset( &ragdoll.animfriction, 0, sizeof(ragdoll.animfriction) );
return;
if ( !params.pCollide || params.pCollide->solidCount > RAGDOLL_MAX_ELEMENTS ) if ( !params.pCollide || params.pCollide->solidCount > RAGDOLL_MAX_ELEMENTS )
return; return;