celisej567/source-engine
1
0
Fork 0
mirror of https://github.com/celisej567/source-engine.git synced 2026-01-05 22:09:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into windows

Browse Source
This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
parent edbe1baceb a53fff833f
commit 90cd6e0e15
3089 changed files with 38642 additions and 844823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
vphysics/main.cpp
View File

@@ -189,8 +189,8 @@ IPhysicsCollisionSet *CPhysicsInterface::FindOrCreateCollisionSet( unsigned int
IPhysicsCollisionSet *pSet = FindCollisionSet( id );
if ( pSet )
return pSet;
int index = m_collisionSets.AddToTail();
m_pCollisionSetHash->add_elem( (void *)id, (void *)(index+1) );
intp index = m_collisionSets.AddToTail();
m_pCollisionSetHash->add_elem( (void *)(intp)id, (void *)(intp)(index+1) );
return &m_collisionSets[index];
}
@@ -198,7 +198,7 @@ IPhysicsCollisionSet *CPhysicsInterface::FindCollisionSet( unsigned int id )
{
if ( m_pCollisionSetHash )
{
int index = (int)m_pCollisionSetHash->find_elem( (void *)id );
intp index = (intp)m_pCollisionSetHash->find_elem( (void *)(intp)id );
if ( index > 0 )
{
Assert( index <= m_collisionSets.Count() );
@@ -223,20 +223,20 @@ void CPhysicsInterface::DestroyAllCollisionSets()
// In release build, each of these libraries must contain a symbol that indicates it is also a release build
// You MUST disable this in order to run a release vphysics.dll with a debug library.
// This should not usually be necessary
#if !defined(_DEBUG) && defined(_WIN32)
extern int ivp_physics_lib_is_a_release_build;
extern int ivp_compactbuilder_lib_is_a_release_build;
extern int hk_base_lib_is_a_release_build;
extern int hk_math_lib_is_a_release_build;
extern int havana_constraints_lib_is_a_release_build;
// #if !defined(_DEBUG) && defined(_WIN32)
// extern int ivp_physics_lib_is_a_release_build;
// extern int ivp_compactbuilder_lib_is_a_release_build;
// extern int hk_base_lib_is_a_release_build;
// extern int hk_math_lib_is_a_release_build;
// extern int havana_constraints_lib_is_a_release_build;
void DebugTestFunction()
{
ivp_physics_lib_is_a_release_build = 0;
ivp_compactbuilder_lib_is_a_release_build = 0;
hk_base_lib_is_a_release_build = 0;
hk_math_lib_is_a_release_build = 0;
havana_constraints_lib_is_a_release_build = 0;
}
#endif
// void DebugTestFunction()
// {
// ivp_physics_lib_is_a_release_build = 0;
// ivp_compactbuilder_lib_is_a_release_build = 0;
// hk_base_lib_is_a_release_build = 0;
// hk_math_lib_is_a_release_build = 0;
// havana_constraints_lib_is_a_release_build = 0;
// }
// #endif